Changed from separate md4/md5 checksum files to a single combined file.
[rsync/rsync-patches.git] / checksum-updating.diff
CommitLineData
ae10e51e 1This adds a sender optimization feature that allows a cache of checksums
56522462
WD
2to be used when the client specifies the --checksum option, and creates
3and/or updates the .rsyncsums files when --checksum-updating is
4specified.
ae10e51e
WD
5
6To use this patch, run these commands for a successful build:
7
8 patch -p1 <patches/checksum-updating.diff
9 ./configure (optional if already run)
10 make
11
12TODO: when sending individual files (as opposed to an entire directory),
56522462
WD
13we should still update the .rsyncsums file if we compute a new checksum.
14(The file is currently only written if we send an entire dir.)
ae10e51e
WD
15
16--- old/clientserver.c
17+++ new/clientserver.c
18@@ -37,6 +37,7 @@ extern int sanitize_paths;
19 extern int filesfrom_fd;
20 extern int remote_protocol;
21 extern int protocol_version;
22+extern int checksum_updating;
23 extern int io_timeout;
24 extern int no_detach;
25 extern int default_af_hint;
26@@ -634,6 +635,8 @@ static int rsync_module(int f_in, int f_
27 else if (am_root < 0) /* Treat --fake-super from client as --super. */
28 am_root = 2;
29
30+ checksum_updating = lp_checksum_updating(i);
31+
32 if (filesfrom_fd == 0)
33 filesfrom_fd = f_in;
34
35--- old/flist.c
36+++ new/flist.c
37@@ -25,6 +25,7 @@
38 #include "io.h"
39
40 extern int verbose;
41+extern int dry_run;
42 extern int list_only;
43 extern int am_root;
44 extern int am_server;
45@@ -57,6 +58,7 @@ extern int implied_dirs;
46 extern int file_extra_cnt;
47 extern int ignore_perishable;
48 extern int non_perishable_cnt;
49+extern int checksum_updating;
50 extern int prune_empty_dirs;
51 extern int copy_links;
52 extern int copy_unsafe_links;
56522462
WD
53@@ -79,6 +81,9 @@ extern iconv_t ic_send, ic_recv;
54
55 #define PTR_SIZE (sizeof (struct file_struct *))
56
57+#define FLAG_SUM_MISSING (1<<1)
58+#define FLAG_SUM_FOUND (1<<2)
59+
60 int io_error;
61 int checksum_len;
62 dev_t filesystem_dev; /* used to implement -x */
63@@ -101,6 +106,8 @@ static char tmp_sum[MAX_DIGEST_LEN];
ae10e51e
WD
64 static char empty_sum[MAX_DIGEST_LEN];
65 static int flist_count_offset; /* for --delete --progress */
66 static int dir_count = 0;
67+static struct file_list *checksum_flist = NULL;
68+static int checksum_matches = 0;
69
70 static void clean_flist(struct file_list *flist, int strip_root);
71 static void output_flist(struct file_list *flist);
56522462 72@@ -317,6 +324,259 @@ static void flist_done_allocating(struct
ae10e51e
WD
73 flist->pool_boundary = ptr;
74 }
75
76+/* The len count is the length of the basename + 1 for the null. */
77+static void add_checksum(const char *dirname, const char *basename, int len,
78+ OFF_T file_length, time_t mtime, const char *sum,
56522462 79+ const char *alt_sum, int flags)
ae10e51e
WD
80+{
81+ struct file_struct *file;
82+ int alloc_len, extra_len;
83+ char *bp;
84+
56522462 85+ if (len == 10+1 && *basename == '.' && strcmp(basename, ".rsyncsums") == 0)
ae10e51e
WD
86+ return;
87+
88+ if (len < 0)
89+ len = strlen(basename) + 1;
90+
91+ extra_len = (file_extra_cnt + (file_length > 0xFFFFFFFFu) + SUM_EXTRA_CNT)
92+ * EXTRA_LEN;
93+#if EXTRA_ROUNDING > 0
94+ if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN))
95+ extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN;
96+#endif
56522462 97+ alloc_len = FILE_STRUCT_LEN + extra_len + len + checksum_len*2 + 1;
ae10e51e
WD
98+ bp = pool_alloc(checksum_flist->file_pool, alloc_len, "add_checksum");
99+
100+ memset(bp, 0, extra_len + FILE_STRUCT_LEN);
101+ bp += extra_len;
102+ file = (struct file_struct *)bp;
103+ bp += FILE_STRUCT_LEN;
104+
105+ memcpy(bp, basename, len);
56522462
WD
106+ if (alt_sum)
107+ strlcpy(bp+len, alt_sum, checksum_len*2 + 1);
108+ else {
109+ memset(bp+len, '=', checksum_len*2);
110+ bp[len+checksum_len*2] = '\0';
111+ }
ae10e51e
WD
112+
113+ file->flags = flags;
114+ file->mode = S_IFREG;
115+ file->modtime = mtime;
116+ file->len32 = (uint32)file_length;
117+ if (file_length > 0xFFFFFFFFu) {
118+ file->flags |= FLAG_LENGTH64;
119+ OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32);
120+ }
121+ file->dirname = dirname;
122+ bp = (char*)F_SUM(file);
123+ memcpy(bp, sum, checksum_len);
124+
125+ flist_expand(checksum_flist, 1);
126+ checksum_flist->files[checksum_flist->count++] = file;
127+
128+ checksum_flist->sorted = checksum_flist->files;
129+}
130+
131+/* The direname value must remain unchanged during the lifespan of the
132+ * created checksum_flist object because we use it directly. */
133+static void read_checksums(const char *dirname)
134+{
135+ char line[MAXPATHLEN+1024], fbuf[MAXPATHLEN], sum[MAX_DIGEST_LEN];
56522462 136+ const char *alt_sum = NULL;
ae10e51e
WD
137+ OFF_T file_length;
138+ time_t mtime;
139+ int len, dlen, i, flags;
140+ char *cp;
141+ FILE *fp;
142+
143+ if (checksum_flist) {
144+ /* Reset the pool memory and empty the file-list array. */
145+ pool_free_old(checksum_flist->file_pool,
146+ pool_boundary(checksum_flist->file_pool, 0));
147+ checksum_flist->count = 0;
148+ } else
149+ checksum_flist = flist_new(FLIST_TEMP, "read_checksums");
150+
151+ checksum_flist->low = 0;
152+ checksum_flist->high = -1;
153+ checksum_matches = 0;
154+
ae10e51e
WD
155+ if (dirname) {
156+ dlen = strlcpy(fbuf, dirname, sizeof fbuf);
157+ if (dlen >= (int)sizeof fbuf)
158+ return;
159+ fbuf[dlen++] = '/';
160+ } else
161+ dlen = 0;
56522462 162+ strlcpy(fbuf+dlen, ".rsyncsums", sizeof fbuf - dlen);
ae10e51e
WD
163+ if (!(fp = fopen(fbuf, "r")))
164+ return;
165+
166+ while (fgets(line, sizeof line, fp)) {
56522462
WD
167+ cp = line;
168+ if (protocol_version >= 30) {
169+ alt_sum = cp;
170+ if (*cp == '=')
171+ while (*++cp == '=') {}
172+ else
173+ while (isXDigit(cp)) cp++;
174+ if (cp - alt_sum != MD4_DIGEST_LEN*2 || *cp != ' ')
175+ break;
176+ while (*++cp == ' ') {}
177+ }
178+
179+ if (*cp == '=') {
180+ for (i = 0; i < checksum_len*2; i++, cp++) {
181+ if (*cp != '=') {
ae10e51e
WD
182+ cp = "";
183+ break;
184+ }
ae10e51e 185+ }
56522462
WD
186+ memset(sum, 0, checksum_len);
187+ flags = FLAG_SUM_MISSING;
188+ } else {
189+ for (i = 0; i < checksum_len*2; i++, cp++) {
190+ int x;
191+ if (isXDigit(cp)) {
192+ if (isDigit(cp))
193+ x = *cp - '0';
194+ else
195+ x = (*cp & 0xF) + 9;
196+ } else {
197+ cp = "";
198+ break;
199+ }
200+ if (i & 1)
201+ sum[i/2] |= x;
202+ else
203+ sum[i/2] = x << 4;
204+ }
205+ flags = 0;
ae10e51e 206+ }
ae10e51e 207+ if (*cp != ' ')
56522462 208+ break;
ae10e51e
WD
209+ while (*++cp == ' ') {}
210+
56522462
WD
211+ if (protocol_version < 30) {
212+ alt_sum = cp;
213+ if (*cp == '=')
214+ while (*++cp == '=') {}
215+ else
216+ while (isXDigit(cp)) cp++;
217+ if (cp - alt_sum != MD5_DIGEST_LEN*2 || *cp != ' ')
218+ break;
219+ while (*++cp == ' ') {}
220+ }
221+
ae10e51e
WD
222+ file_length = 0;
223+ while (isDigit(cp))
224+ file_length = file_length * 10 + *cp++ - '0';
ae10e51e 225+ if (*cp != ' ')
56522462 226+ break;
ae10e51e
WD
227+ while (*++cp == ' ') {}
228+
229+ mtime = 0;
230+ while (isDigit(cp))
231+ mtime = mtime * 10 + *cp++ - '0';
ae10e51e 232+ if (*cp != ' ')
56522462 233+ break;
ae10e51e
WD
234+ while (*++cp == ' ') {}
235+
236+ len = strlen(cp);
237+ while (len && (cp[len-1] == '\n' || cp[len-1] == '\r'))
238+ len--;
239+ if (!len)
56522462 240+ break;
ae10e51e
WD
241+ cp[len++] = '\0'; /* len now counts the null */
242+ if (strchr(cp, '/') || len > MAXPATHLEN)
56522462 243+ break;
ae10e51e
WD
244+
245+ strlcpy(fbuf+dlen, cp, sizeof fbuf - dlen);
246+ if (is_excluded(fbuf, 0, ALL_FILTERS)) {
56522462 247+ flags |= FLAG_SUM_FOUND;
ae10e51e 248+ checksum_matches++;
56522462 249+ }
ae10e51e 250+
56522462
WD
251+ add_checksum(dirname, cp, len, file_length, mtime,
252+ sum, alt_sum, flags);
ae10e51e
WD
253+ }
254+ fclose(fp);
255+
256+ clean_flist(checksum_flist, 0);
257+}
258+
259+static void write_checksums(const char *dirname)
260+{
261+ char buf[MAXPATHLEN+1024];
56522462
WD
262+ int count = checksum_flist->count;
263+ int new_entries = count > checksum_flist->high + 1;
264+ int orphan_entires = count != checksum_matches;
ae10e51e
WD
265+ FILE *out_fp;
266+ int i;
267+
ae10e51e 268+
56522462 269+ for (i = checksum_flist->high + 1; i < count; i++) {
ae10e51e 270+ struct file_struct *file = checksum_flist->sorted[i];
56522462 271+ file->flags |= FLAG_SUM_FOUND;
ae10e51e
WD
272+ }
273+
274+ clean_flist(checksum_flist, 0);
56522462
WD
275+ checksum_flist->count = 0;
276+ checksum_matches = 0;
277+
278+ if (dry_run)
279+ return;
ae10e51e 280+
ae10e51e 281+ if (dirname) {
56522462 282+ if (pathjoin(buf, sizeof buf, dirname, ".rsyncsums") >= sizeof buf)
ae10e51e
WD
283+ return;
284+ } else
56522462 285+ strlcpy(buf, ".rsyncsums", sizeof buf);
ae10e51e
WD
286+
287+ if (checksum_flist->high - checksum_flist->low < 0) {
288+ unlink(buf);
289+ return;
290+ }
291+
292+ if (!new_entries && !orphan_entires)
293+ return;
294+
295+ if (!(out_fp = fopen(buf, "w")))
296+ return;
297+
298+ for (i = checksum_flist->low; i <= checksum_flist->high; i++) {
299+ struct file_struct *file = checksum_flist->sorted[i];
300+ const char *cp = F_SUM(file);
301+ const char *end = cp + checksum_len;
56522462 302+ if (!(file->flags & FLAG_SUM_FOUND))
ae10e51e 303+ continue;
56522462
WD
304+ if (protocol_version >= 30) {
305+ fprintf(out_fp, "%s ",
306+ file->basename + strlen(file->basename) + 1);
307+ }
308+ if (file->flags & FLAG_SUM_MISSING) {
309+ do {
310+ fprintf(out_fp, "==");
311+ } while (++cp != end);
312+ } else {
313+ do {
314+ fprintf(out_fp, "%02x", CVAL(cp, 0));
315+ } while (++cp != end);
316+ }
317+ if (protocol_version < 30) {
318+ fprintf(out_fp, " %s",
319+ file->basename + strlen(file->basename) + 1);
320+ }
ae10e51e
WD
321+ fprintf(out_fp, " %10.0f %10ld %s\n",
322+ (double)F_LENGTH(file), (long)file->modtime,
323+ file->basename);
324+ }
325+
326+ fclose(out_fp);
327+}
328+
329 int push_pathname(const char *dir, int len)
330 {
331 if (dir == pathname)
56522462 332@@ -973,34 +1233,24 @@ static struct file_struct *recv_file_ent
ae10e51e
WD
333 return file;
334 }
335
336-/**
337- * Create a file_struct for a named file by reading its stat()
338- * information and performing extensive checks against global
339- * options.
340- *
341- * @return the new file, or NULL if there was an error or this file
342- * should be excluded.
343+/* Create a file_struct for a named file by reading its stat() information
344+ * and performing extensive checks against global options.
345 *
346- * @todo There is a small optimization opportunity here to avoid
347- * stat()ing the file in some circumstances, which has a certain cost.
348- * We are called immediately after doing readdir(), and so we may
349- * already know the d_type of the file. We could for example avoid
350- * statting directories if we're not recursing, but this is not a very
351- * important case. Some systems may not have d_type.
352- **/
353+ * Returns a pointer to the new file struct, or NULL if there was an error
354+ * or this file should be excluded. */
355 struct file_struct *make_file(const char *fname, struct file_list *flist,
356 STRUCT_STAT *stp, int flags, int filter_level)
357 {
358 static char *lastdir;
359- static int lastdir_len = -1;
360+ static int lastdir_len = -2;
361 struct file_struct *file;
362- STRUCT_STAT st;
363 char thisname[MAXPATHLEN];
364 char linkname[MAXPATHLEN];
365 int alloc_len, basename_len, linkname_len;
366 int extra_len = file_extra_cnt * EXTRA_LEN;
367 const char *basename;
368 alloc_pool_t *pool;
369+ STRUCT_STAT st;
370 char *bp;
371
372 if (strlcpy(thisname, fname, sizeof thisname)
56522462 373@@ -1115,9 +1365,16 @@ struct file_struct *make_file(const char
ae10e51e
WD
374 memcpy(lastdir, thisname, len);
375 lastdir[len] = '\0';
376 lastdir_len = len;
377+ if (always_checksum && am_sender && flist)
378+ read_checksums(lastdir);
379 }
380- } else
381+ } else {
382 basename = thisname;
383+ if (always_checksum && am_sender && flist && lastdir_len == -2) {
384+ lastdir_len = -1;
385+ read_checksums(NULL);
386+ }
387+ }
388 basename_len = strlen(basename) + 1; /* count the '\0' */
389
390 #ifdef SUPPORT_LINKS
56522462 391@@ -1193,11 +1450,36 @@ struct file_struct *make_file(const char
ae10e51e
WD
392 }
393 #endif
394
395- if (always_checksum && am_sender && S_ISREG(st.st_mode))
396- file_checksum(thisname, tmp_sum, st.st_size);
397-
398 F_PATHNAME(file) = pathname;
399
400+ if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
401+ int j;
402+ if (flist && (j = flist_find(checksum_flist, file)) >= 0) {
403+ struct file_struct *fp = checksum_flist->sorted[j];
56522462
WD
404+ if (fp->modtime == st.st_mtime && F_LENGTH(fp) == st.st_size) {
405+ if (fp->flags & FLAG_SUM_MISSING) {
406+ fp->flags &= ~FLAG_SUM_MISSING;
407+ file_checksum(thisname, tmp_sum, st.st_size);
408+ memcpy((char*)F_SUM(fp), tmp_sum, MAX_DIGEST_LEN);
409+ } else {
410+ checksum_matches++;
411+ memcpy(tmp_sum, F_SUM(fp), MAX_DIGEST_LEN);
412+ }
413+ fp->flags |= FLAG_SUM_FOUND;
ae10e51e
WD
414+ } else {
415+ clear_file(fp);
416+ goto compute_checksum;
417+ }
418+ } else {
419+ compute_checksum:
420+ file_checksum(thisname, tmp_sum, st.st_size);
421+ if (checksum_updating && flist) {
422+ add_checksum(file->dirname, basename, basename_len,
56522462 423+ st.st_size, st.st_mtime, tmp_sum, NULL, 0);
ae10e51e
WD
424+ }
425+ }
426+ }
427+
428 /* This code is only used by the receiver when it is building
429 * a list of files for a delete pass. */
430 if (keep_dirlinks && linkname_len && flist) {
56522462 431@@ -1241,14 +1523,14 @@ void unmake_file(struct file_struct *fil
ae10e51e
WD
432
433 static struct file_struct *send_file_name(int f, struct file_list *flist,
434 char *fname, STRUCT_STAT *stp,
435- int flags, int filter_flags)
436+ int flags, int filter_level)
437 {
438 struct file_struct *file;
439 #if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
440 statx sx;
441 #endif
442
443- file = make_file(fname, flist, stp, flags, filter_flags);
444+ file = make_file(fname, flist, stp, flags, filter_level);
445 if (!file)
446 return NULL;
447
56522462 448@@ -1442,7 +1724,7 @@ static void send_directory(int f, struct
ae10e51e
WD
449 DIR *d;
450 int divert_dirs = (flags & FLAG_DIVERT_DIRS) != 0;
451 int start = flist->count;
452- int filter_flags = f == -2 ? SERVER_FILTERS : ALL_FILTERS;
453+ int filter_level = f == -2 ? SERVER_FILTERS : ALL_FILTERS;
454
455 assert(flist != NULL);
456
56522462 457@@ -1471,7 +1753,7 @@ static void send_directory(int f, struct
ae10e51e
WD
458 continue;
459 }
460
461- send_file_name(f, flist, fbuf, NULL, flags, filter_flags);
462+ send_file_name(f, flist, fbuf, NULL, flags, filter_level);
463 }
464
465 fbuf[len] = '\0';
56522462 466@@ -1483,6 +1765,9 @@ static void send_directory(int f, struct
ae10e51e
WD
467
468 closedir(d);
469
470+ if (checksum_updating && always_checksum && am_sender && f >= 0)
471+ write_checksums(fbuf);
472+
473 if (f >= 0 && recurse && !divert_dirs) {
474 int i, end = flist->count - 1;
475 /* send_if_directory() bumps flist->count, so use "end". */
56522462 476@@ -2206,7 +2491,7 @@ void flist_free(struct file_list *flist)
ae10e51e
WD
477
478 if (!flist->prev || !flist_cnt)
479 pool_destroy(flist->file_pool);
480- else
481+ else if (flist->pool_boundary)
482 pool_free_old(flist->file_pool, flist->pool_boundary);
483
484 if (flist->sorted && flist->sorted != flist->files)
56522462 485@@ -2225,6 +2510,7 @@ static void clean_flist(struct file_list
ae10e51e
WD
486 if (!flist)
487 return;
488 if (flist->count == 0) {
489+ flist->low = 0;
490 flist->high = -1;
491 return;
492 }
493--- old/loadparm.c
494+++ new/loadparm.c
495@@ -149,6 +149,7 @@ typedef struct
496 int syslog_facility;
497 int timeout;
498
499+ BOOL checksum_updating;
500 BOOL fake_super;
501 BOOL ignore_errors;
502 BOOL ignore_nonreadable;
503@@ -197,6 +198,7 @@ static service sDefault =
504 /* syslog_facility; */ LOG_DAEMON,
505 /* timeout; */ 0,
506
507+ /* checksum_updating; */ False,
508 /* fake_super; */ False,
509 /* ignore_errors; */ False,
510 /* ignore_nonreadable; */ False,
511@@ -313,6 +315,7 @@ static struct parm_struct parm_table[] =
512 {"lock file", P_STRING, P_LOCAL, &sDefault.lock_file, NULL,0},
513 {"log file", P_STRING, P_LOCAL, &sDefault.log_file, NULL,0},
514 {"log format", P_STRING, P_LOCAL, &sDefault.log_format, NULL,0},
515+ {"checksum updating", P_BOOL, P_LOCAL, &sDefault.checksum_updating, NULL,0},
516 {"max connections", P_INTEGER,P_LOCAL, &sDefault.max_connections, NULL,0},
517 {"max verbosity", P_INTEGER,P_LOCAL, &sDefault.max_verbosity, NULL,0},
518 {"name", P_STRING, P_LOCAL, &sDefault.name, NULL,0},
519@@ -418,6 +421,7 @@ FN_LOCAL_BOOL(lp_fake_super, fake_super)
520 FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
521 FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
522 FN_LOCAL_BOOL(lp_list, list)
523+FN_LOCAL_BOOL(lp_checksum_updating, checksum_updating)
524 FN_LOCAL_BOOL(lp_read_only, read_only)
525 FN_LOCAL_BOOL(lp_strict_modes, strict_modes)
526 FN_LOCAL_BOOL(lp_transfer_logging, transfer_logging)
527--- old/options.c
528+++ new/options.c
529@@ -109,6 +109,7 @@ size_t bwlimit_writemax = 0;
530 int ignore_existing = 0;
531 int ignore_non_existing = 0;
532 int need_messages_from_generator = 0;
533+int checksum_updating = 0;
534 int max_delete = -1;
535 OFF_T max_size = 0;
536 OFF_T min_size = 0;
537@@ -302,6 +303,7 @@ void usage(enum logcode F)
538 rprintf(F," -q, --quiet suppress non-error messages\n");
539 rprintf(F," --no-motd suppress daemon-mode MOTD (see manpage caveat)\n");
540 rprintf(F," -c, --checksum skip based on checksum, not mod-time & size\n");
56522462 541+ rprintf(F," --checksum-updating sender updates .rsyncsums files\n");
ae10e51e
WD
542 rprintf(F," -a, --archive archive mode; equals -rlptgoD (no -H,-A,-X)\n");
543 rprintf(F," --no-OPTION turn off an implied OPTION (e.g. --no-D)\n");
544 rprintf(F," -r, --recursive recurse into directories\n");
545@@ -542,6 +544,7 @@ static struct poptOption long_options[]
546 {"checksum", 'c', POPT_ARG_VAL, &always_checksum, 1, 0, 0 },
547 {"no-checksum", 0, POPT_ARG_VAL, &always_checksum, 0, 0, 0 },
548 {"no-c", 0, POPT_ARG_VAL, &always_checksum, 0, 0, 0 },
549+ {"checksum-updating",0, POPT_ARG_NONE, &checksum_updating, 0, 0, 0 },
550 {"block-size", 'B', POPT_ARG_LONG, &block_size, 0, 0, 0 },
551 {"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
552 {"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
553@@ -1896,7 +1899,9 @@ void server_options(char **args,int *arg
554 args[ac++] = basis_dir[i];
555 }
556 }
557- }
558+ } else if (checksum_updating)
559+ args[ac++] = "--checksum-updating";
560+
561
562 if (append_mode)
563 args[ac++] = "--append";
564--- old/rsync.h
565+++ new/rsync.h
566@@ -1070,6 +1070,12 @@ isDigit(const char *ptr)
567 }
568
569 static inline int
56522462 570+isXDigit(const char *ptr)
ae10e51e 571+{
56522462 572+ return isxdigit(*(unsigned char *)ptr);
ae10e51e
WD
573+}
574+
575+static inline int
576 isPrint(const char *ptr)
577 {
578 return isprint(*(unsigned char *)ptr);
579--- old/rsync.yo
580+++ new/rsync.yo
581@@ -307,6 +307,7 @@ to the detailed description below for a
582 -q, --quiet suppress non-error messages
583 --no-motd suppress daemon-mode MOTD (see caveat)
584 -c, --checksum skip based on checksum, not mod-time & size
56522462 585+ --checksum-updating sender updates .rsyncsums files
ae10e51e
WD
586 -a, --archive archive mode; equals -rlptgoD (no -H,-A,-X)
587 --no-OPTION turn off an implied OPTION (e.g. --no-D)
588 -r, --recursive recurse into directories
589@@ -502,9 +503,9 @@ uses a "quick check" that (by default) c
590 of last modification match between the sender and receiver. This option
591 changes this to compare a 128-bit MD4 checksum for each file that has a
592 matching size. Generating the checksums means that both sides will expend
593-a lot of disk I/O reading all the data in the files in the transfer (and
594-this is prior to any reading that will be done to transfer changed files),
595-so this can slow things down significantly.
596+a lot of disk I/O reading the data in all the files in the transfer, so
597+this can slow things down significantly (and this is prior to any reading
598+that will be done to transfer the files that have changed).
599
600 The sending side generates its checksums while it is doing the file-system
601 scan that builds the list of the available files. The receiver generates
56522462 602@@ -512,12 +513,42 @@ its checksums when it is scanning for ch
ae10e51e
WD
603 file that has the same size as the corresponding sender's file: files with
604 either a changed size or a changed checksum are selected for transfer.
605
606+Starting with version 3.0.0, the sending side will look for a checksum
607+summary file and use a pre-generated checksum that it reads out of the file
608+(as long as it matches the file's size and modified time). This allows a
609+server to support the --checksum option to clients without having to
610+recompute the checksums for each client. See the bf(--checksum-updating)
56522462 611+option for a way to have rsync create/update these checksum files.
ae10e51e
WD
612+
613 Note that rsync always verifies that each em(transferred) file was
614 correctly reconstructed on the receiving side by checking a whole-file
615 checksum that is generated when as the file is transferred, but that
616 automatic after-the-transfer verification has nothing to do with this
617 option's before-the-transfer "Does this file need to be updated?" check.
618
619+dit(bf(--checksum-updating)) This option tells the sending side to create
620+and/or update per-directory checksum files that are used by the
56522462
WD
621+bf(--checksum) option. The file that is updated is named .rsyncsums. If
622+pre-transfer checksums are not being computed, this option has no effect.
ae10e51e
WD
623+
624+The checksum files stores the computed checksum, last-known size,
625+modification time, and name for each file in the current directory. If a
626+later transfer finds that a file matches its prior size and modification
627+time, the checksum is assumed to still be correct. Otherwise it is
628+recomputed and udpated in the file.
629+
630+To avoid transferring the system's checksum files, you can use an exclude
56522462 631+(e.g. bf(--exclude=.rsyncsums)). To make this easier to type, you can use
ae10e51e
WD
632+a popt alias. For instance, adding the following line in your ~/.popt file
633+defines a bf(-cc) option that enables checksum updating and excludes the
634+checksum files:
635+
56522462 636+verb( rsync alias --cc --checksum-updating --exclude=.rsyncsums)
ae10e51e
WD
637+
638+An rsync daemon does not allow the client to control this setting, so see
639+the "checksum updating" daemon config option for information on how to make
640+a daemon maintain these checksum files.
641+
642 dit(bf(-a, --archive)) This is equivalent to bf(-rlptgoD). It is a quick
643 way of saying you want recursion and want to preserve almost
644 everything (with -H being a notable omission).
645--- old/rsyncd.conf.yo
646+++ new/rsyncd.conf.yo
56522462 647@@ -198,6 +198,20 @@ locking on this file to ensure that the
ae10e51e
WD
648 exceeded for the modules sharing the lock file.
649 The default is tt(/var/run/rsyncd.lock).
650
651+dit(bf(checksum updating)) This option tells rsync to update/create the
652+checksum information in the per-directory checksum files when users copy
653+files using the bf(--checksum) option. Any file that has changed since it
654+was last checksummed (or is not mentioned) has its data updated in the
56522462 655+.rsyncsums file.
ae10e51e
WD
656+
657+Note that this updating will occur even if the module is listed as being
658+read-only. If you want to hide these files (and you will almost always
56522462 659+want to do), add ".rsyncsums" to the module's exclude setting.
ae10e51e
WD
660+
661+Note also that the client's command-line option, bf(--checksum-updating),
662+has no effect on a daemon. A daemon will only update/create checksum files
663+if this config option is true.
664+
665 dit(bf(read only)) The "read only" option determines whether clients
666 will be able to upload files or not. If "read only" is true then any
667 attempted uploads will fail. If "read only" is false then uploads will