rsync - Jan 2005 - --bwlimit doesn't work for daemon mode

[I'm not subscribed, please CC me on replies]

Some time after 2.6.0 the --bwlimit code was enhanced, but the code now
doesn't work anymore when you set the bandwidth limit for the daemon and
generates error log entries like:

2005/01/13 08:17:03 [29636] rsync: writefd_unbuffered failed to write 12 \
  bytes: phase "unknown" [receiver]: Success (0)
2005/01/13 08:17:03 [29636] rsync error: error in rsync protocol data \
  stream (code 12) at io.c(909)

Regards, Uwe
--------------------------------------------------------------------------
diff -ur /tmp/rsync-2.6.3/options.c ./options.c
--- /tmp/rsync-2.6.3/options.c	2004-09-23 17:39:05.000000000 +0000
+++ ./options.c	2005-01-13 08:47:09.292810016 +0000
@@ -769,6 +768,12 @@
 		}
 	}
 
+	if (bwlimit) {
+		bwlimit_writemax = (size_t)bwlimit * 128;
+		if (bwlimit_writemax < 512)
+			bwlimit_writemax = 512;
+	}
+
 	if (daemon_opt) {
 		daemon_opt = 0;
 		am_daemon = 1;
@@ -807,11 +812,6 @@
 	if (do_progress && !verbose)
 		verbose = 1;
 
-	if (bwlimit) {
-		bwlimit_writemax = (size_t)bwlimit * 128;
-		if (bwlimit_writemax < 512)
-			bwlimit_writemax = 512;
-	}
 
 	if (inplace) {

On Thu, Jan 13, 2005 at 09:12:12AM +0000, uwe@ohse.de
wrote:
> Some time after 2.6.0 the --bwlimit code was enhanced, but the code now
> doesn't work anymore when you set the bandwidth limit for the daemon
First, thanks for the patch -- they are always appreciated!  However,
your patch is identical to the one suggested in this message:

http://www.mail-archive.com/rsync@lists.samba.org/msg11850.html

The conversation then went on to mention that --bwlimit has never really
been a daemon option, and only coincidentally set a default bandwidth-
limit value for a daemon (in older versions).  However, that value could
be exceeded by the client (which is what your patch re-enables).  Though
the cited mailing-list thread doesn't mention it, the code in CVS now
has a better --bwlimit option for the daemon that makes this value an
enforced upper-limit on transfers from the daemon.  (Nothing tries to
limit transfers into a daemon other than the a user-specified --bwlimit
option.)

Note that the cited patch works fine for restoring the old --bwlimit
behavior to 2.6.3, and in fact, some Linux distributions (such as
Debian) have used it to patch their packaged version of 2.6.3.

..wayne..