Details

Reviewers

cracauer
asomers
kevans

Commits

rG8e65c6674750: install: Expect EINTR while copying
rGcd24bdb92c10: install: Expect EINTR while copying
rG9f1bff69b0b8: install: Expect EINTR while copying
rG0fb940fd63dd: install: Expect EINTR while copying

Summary

Both copy_file_range() and read() / write() in our fallback loop can be
interrupted before copying anything at all, in which case it returns -1
and sets errno to EINTR. If that happens, we should retry, not fail.

While here, drop the size argument from copy() (we always want to copy
the entire file anyway) and add a test case that exercises the metalog
and digest functionality.

MFC after: 1 week
PR: 293028

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 70617
Build 67500: arc lint + arc unit

Event Timeline

des created this revision.Sat, Feb 7, 5:46 PM

Herald added a subscriber: imp. · View Herald TranscriptSat, Feb 7, 5:46 PM

des requested review of this revision.Sat, Feb 7, 5:46 PM

Harbormaster completed remote builds in B70505: Diff 171423.Sat, Feb 7, 5:46 PM

Fix fallback too. This is an excellent argument for creating
something like Apple's libcopyfile...

Harbormaster completed remote builds in B70506: Diff 171424.Sat, Feb 7, 5:59 PM

des edited the summary of this revision. (Show Details)Sun, Feb 8, 4:07 PM

fix digest

Harbormaster completed remote builds in B70524: Diff 171457.Sun, Feb 8, 4:07 PM

range

Harbormaster completed remote builds in B70527: Diff 171461.Sun, Feb 8, 4:26 PM

kevans added inline comments.Tue, Feb 10, 2:34 PM

usr.bin/xinstall/tests/install_test.sh
527	A filename with a space that needs encoded would maybe be useful here, to demonstrate that it's properly escaping

des added inline comments.Tue, Feb 10, 2:47 PM

usr.bin/xinstall/tests/install_test.sh
527	The point of this test is to exercise the digest functionality, which I accidentally broke in an earlier version of this patch. What you describe belongs in a more general test of the metalog functionality, which is not my goal here.

kevans added inline comments.Tue, Feb 10, 10:26 PM

usr.bin/xinstall/tests/install_test.sh
527	That is the impression you give by writing test case that exercises the metalog and digest functionality. I'm not asking for exhaustive metalog tests, just one specific bit that's easy to screw up and super easy to test while you're already here.