rsync - May 2006 - Partial files left on SIGINT

Hi,

As the man page says, the --partial flag is to "keep partially
transferred files". I'm assuming if I don't have partial flag any
partially transferred files should be deleted. However this is not what
I'm seeing.

Example:

(Using a big file so that rsync times a while to run. This gives me time
to hit CTRL-C for the SIGINT).
> mkdir example
> dd if=/dev/zero of=example/big_file bs=1024 count=102400
> ls -l example
-rw-r--r-- 1 jmitchell users 104857600 2006-05-18 16:33 big_file
> rsync -ptgou example/big_file .
# Let it run for a couple of seconds to start running, then hit CTRL-C

rsync error: received SIGINT, SIGTERM, or SIGHUP (code 20) at
rsync.c(242) [sender=2.6.8]
rsync: writefd_unbuffered failed to write 78 bytes [generator]: Broken
pipe (32)rsync error: error in rsync protocol data stream (code 12) at
io.c(1121) [generator=2.6.8]
> ls -l big_file
ls: big_file: No such file or directory
> ls -l .big_file*
-rw------- 1 jmitchell users 36700160 2006-05-18 16:36 .big_file.b1eEq1


This is I believe a partially transferred copy of .big_file. I would
have expected this to be deleted on the SIGINT, unless I had the
--partial flag set, which I do not.

If I run rsync again and allow it to complete fully without a SIGINT, I
get:
> ls -l big_file
-rw-r--r-- 1 jmitchell users 104857600 2006-05-18 16:33 big_file
> ls -l .big_file*
-rw------- 1 jmitchell users 36700160 2006-05-18 16:36 .big_file.b1eEq1

The partially copied file of the original run remains, so leaving it
doesn't seem to save data transfer the second time rsync is run.

Thanks,
 Jon





______________________________________________________________________
This email has been scanned by the MessageLabs Email Security System.
For more information please visit http://www.messagelabs.com/email 
______________________________________________________________________

On Thu, May 18, 2006 at 04:43:58PM +0100, Jon Mitchell
wrote:
> -rw------- 1 jmitchell users 36700160 2006-05-18 16:36 .big_file.b1eEq1
> 
> This is I believe a partially transferred copy of .big_file.
Yes and no.  You're right that the file should have gotten deleted, just
wrong in the terminology of what you're seeing.  (Aside: this is a temp
file, which rsync should never leave behind; a "partial" file in
rsync's
terminology would have been created if this temp file had been renamed
to be "big_file" when the transfer got interrupted.)

This turns out to be a bug in the cleanup code that was introduced in
2.6.7.  The attached patch fixes this.

Thanks for the report!

..wayne..
-------------- next part --------------
--- cleanup.c	9 May 2006 18:31:00 -0000	1.39
+++ cleanup.c	18 May 2006 18:35:30 -0000
@@ -121,7 +121,7 @@ void _exit_cleanup(int code, const char 
 		}
 	}
 
-	if (cleanup_got_literal && cleanup_fname && keep_partial
+	if (cleanup_got_literal && cleanup_new_fname && keep_partial
 	    && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
 		char *fname = cleanup_fname;
 		cleanup_fname = NULL;
@@ -168,7 +168,7 @@ void _exit_cleanup(int code, const char 
 
 void cleanup_disable(void)
 {
-	cleanup_fname = NULL;
+	cleanup_fname = cleanup_new_fname = NULL;
 	cleanup_got_literal = 0;
 }
 
@@ -176,8 +176,8 @@ void cleanup_disable(void)
 void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
 		 int fd_r, int fd_w)
 {
-	cleanup_fname = fname ? fnametmp : NULL;
-	cleanup_new_fname = fname;
+	cleanup_fname = fnametmp;
+	cleanup_new_fname = fname; /* can be NULL on a partial-dir failure */
 	cleanup_file = file;
 	cleanup_fd_r = fd_r;
 	cleanup_fd_w = fd_w;
--- receiver.c	18 May 2006 17:04:40 -0000	1.178
+++ receiver.c	18 May 2006 18:35:30 -0000
@@ -591,8 +591,7 @@ int recv_files(int f_in, struct file_lis
 				continue;
 			}
 
-			if (keep_partial)
-				cleanup_set(fnametmp, partialptr, file, fd1, fd2);
+			cleanup_set(fnametmp, partialptr, file, fd1, fd2);
 		}
 
 		/* log the transfer */