rsync - Mar 2010 - Getting EEXIST out of make_bak_dir()

I have users running rsync 3.0.6 on Mac OS 10.5 and 10.6 with the following
arguments (for example):

rsync -aNHAXx --fileflags --force-change --no-inc-recursive --delete-during
--filter="P _Archive*" --filter="P /*" --backup
--backup-dir="_Archive_2010_March_07_22-27-43" / /Volumes/Backup

I can't seem to figure out how make_bak_dir could be returning this error
for a handful of them:

rsync: make_bak_dir mkdir
"/Volumes/Backup/_Archive_2010_March_07_22-27-43/Users/jsmith/Library/Mail/Mailboxes/
Orchestra" failed: File exists
rsync: keep_backup failed:
"/Volumes/Backup/Users/jsmith/Library/Mail/Mailboxes/   Orchestra/    * New
Mexico Concert/Assistant - John Smith.mbox/Messages/269981.emlx" ->
"_Archive_2010_March_07_22-27-43/Users/jsmith/Library/Mail/Mailboxes/  
Orchestra/    * New Mexico Concert/Assistant - John
Smith.mbox/Messages/269981.emlx": No such file or directory
rsync: stat
"/Volumes/Backup/_Archive_2010_March_07_22-27-43/Users/jsmith/Library/Mail/Mailboxes/
Orchestra/    * New Mexico Concert/Assistant - John
Smith.mbox/Messages/269981.emlx" failed: No such file or directory

Here's another example from a different user:

rsync: make_bak_dir mkdir "/Volumes/LaCie
1TB/_Archive_2010_March_04_18-30-22/Users/jdoe/Library/Caches" failed: File
exists
rsync: keep_backup failed: "/Volumes/LaCie
1TB/Users/jdoe/Library/Caches/Adobe/Color/ACEConfigCache1" ->
"_Archive_2010_March_04_18-30-22/Users/jdoe/Library/Caches/Adobe/Color/ACEConfigCache1":
No such file or directory
rsync: stat "/Volumes/LaCie
1TB/_Archive_2010_March_04_18-30-22/Users/jdoe/Library/Caches/Adobe/Color/ACEConfigCache1"
failed: No such file or directory


Because everywhere that make_bak_dir is called, there's a test that the
previous open() that was called failed with ENOENT.  For example, from
receiver.c:

if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600))
< 0) {
	int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
	if (errno == ENOENT && make_bak_dir(backupptr) == 0) {

Does make_bak_dir simply need to trap for that error, like:

/* Try to find an existing dir, starting from the deepest dir. */
while (1) {
	if (--p == fbuf)
		return -1;
	if (*p == '/') {
		*p = '\0';
		if (mkdir_defmode(fbuf) == 0 || errno == EEXIST) // <-- Trap for EEXIST?
			break;
		if (errno != ENOENT) {
			rsyserr(FERROR, errno,
				"make_bak_dir mkdir %s failed",
				full_fname(fbuf));
			return -1;
		}
	}
}

Thanks,
Mike

-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.samba.org/pipermail/rsync/attachments/20100308/55c611d1/attachment.html>

On Mon, Mar 08, 2010 at 10:02:26AM -0600, Mike Bombich
wrote:
> rsync: make_bak_dir mkdir
"/Volumes/Backup/_Archive_2010_March_07_22-27-43/Users/jsmith/Library/Mail/Mailboxes/
Orchestra" failed: File exists
Is something else creating that directory at the same time?  A race
where 2 processes are creating the same directory would be pretty rare,
though, so it makes me think that OS X is really failing with the wrong
error for a filename it doesn't like.  I note that the next element has
an asterisk in it -- should that work OK on that filesystem?
> rsync: keep_backup failed:
"/Volumes/Backup/Users/jsmith/Library/Mail/Mailboxes/   Orchestra/    * New
Mexico Concert/Assistant - John Smith.mbox/Messages/269981.emlx" ->
"_Archive_2010_March_07_22-27-43/Users/jsmith/Library/Mail/Mailboxes/  
Orchestra/    * New Mexico Concert/Assistant - John
Smith.mbox/Messages/269981.emlx": No such file or directory
Note that this error is for the backup -- since the full path does not
exist, trying to create the backup file returns the ENOENT error.
> 		if (mkdir_defmode(fbuf) == 0 || errno == EEXIST) // <-- Trap for
EEXIST?
The reason I hadn't done that before was because EEXIST gets returned
for any file type -- e.g. file or dir.  But this should be OK for the
make_bak_dir() function because it will always be followed up with
either another mkdir() or an attempt to use the path, which should fail
with ENOTDIR if it momentarily accepts a non-dir.  You might try the
attached patch and see if it helps.

..wayne..
-------------- next part --------------
A non-text attachment was scrubbed...
Name: exist.patch
Type: text/x-diff
Size: 614 bytes
Desc: not available
URL:
<http://lists.samba.org/pipermail/rsync/attachments/20100309/1dae52ae/attachment.patch>