Hi all, These two patches change how rsync handles temporary files on the receiver side. The first patch adds a static token to rsync's temporary filenames. The second patch ignores files with this token when using --cvs-ignore. http://pastebin.com/DL1jCNfm http://pastebin.com/yy9duP8Z The behaviour I wanted to improve was the case where two rsyncs are simultaneously reading and writing the same tree. In this scenario the reader can end up reading the writer's temporary files (unless you use --temp-dir) and copying them elsewhere. A side effect of this change is the names of rsync's temporary files will be "self-documenting" for users running `ls -la`. I've tested this patch on Linux, but am reasonably unfamiliar with C so feedback appreciated. Cheers, Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.samba.org/pipermail/rsync/attachments/20111020/64b7925a/attachment.html>
Any comments? On Thu, Oct 20, 2011 at 3:59 PM, Alex Jurkiewicz <alex at jurkiewi.cz> wrote:> Hi all, > These two patches change how rsync handles temporary files on the receiver > side. The first patch adds a static token to rsync's temporary filenames. > The second patch ignores files with this token when using --cvs-ignore. > http://pastebin.com/DL1jCNfm > http://pastebin.com/yy9duP8Z > The behaviour I wanted to improve was the case where two rsyncs are > simultaneously reading and writing the same tree. In this scenario the > reader can end up reading the writer's temporary files (unless you use > --temp-dir) and copying them elsewhere. > A side effect of this change is the names of rsync's temporary files will be > "self-documenting" for users running `ls -la`. > I've tested this patch on Linux, but am reasonably unfamiliar with C so > feedback appreciated. > Cheers, > Alex
On Wed, Oct 19, 2011 at 9:59 PM, Alex Jurkiewicz <alex at jurkiewi.cz> wrote:> These two patches change how rsync handles temporary files on the receiver > side. The first patch adds a static token to rsync's temporary filenames. > The second patch ignores files with this token when using --cvs-ignore. >[Sorry for the delay in commenting on this.] I like the idea of making the temp files follow a more easily excluded pattern, but the addition of such a long string to the suffix could make the names overflow more easily on really long paths. Perhaps switching the name around to be .FILE_NAME_PART.XXXXXX.rsynctmp and extending the code that trims the name down to allow the .rsynctmp to be trimmed out if absolutely necessary would be a good solution. Then, an exclude of .*.rsynctmp would exclude all the temp files that didn't get truncated at the limit (which would be the majority of the temp files). Doing the reordering would require the mkstemps() function, so any host that didn't support that wouldn't get the new .rsynctmp suffix. Here's a patch that should handle the above idea: http://pastebin.com/UTbtFu8Ta I don't think I'd add the temp files to the cvs exclusion code, since normal single-use copying should be removing old temp files, not ignoring them. Thus, it should be up to the user to choose to exclude the temp files or not. ..wayne.. -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.samba.org/pipermail/rsync/attachments/20111026/c6a6bdcf/attachment.html>