search for: initial_stats

Hi, I'd like to extend rsync's --log-format to be more detailed and ultimately work in --dry-run mode. While i need both of these enhancements, i would rather not maintain such mods over time for our local use, so before i work on this, i'd like to hear back that this is indeed desirable/desired, as well as any advice, suggestion or feedback you may have in the hope to see this

...meaningless. --- rsync-3.0.3.orig/receiver.c 2008-08-20 16:28:41.000000000 +0400 +++ rsync-3.0.3/receiver.c 2008-08-20 16:33:06.000000000 +0400 @@ -678,8 +678,6 @@ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, fname, fd2, F_LENGTH(file)); - log_item(log_code, file, &initial_stats, iflags, NULL); - if (fd1 != -1) close(fd1); if (close(fd2) < 0) { @@ -719,6 +717,7 @@ if (remove_source_files || inc_recurse || (preserve_hard_links && F_IS_HLINKED(file))) send_msg_int(MSG_SUCCESS, ndx); + log_item(log_code, file, &initial_stats, iflags, N...

While going through an old todo list I found that these patches had fallen by the way-side. About a year ago I initiated a discussion[1] with the Linux kernel folks regarding the lack of any useable fadvise support on the kernel side. As a result, I was observing extremely poor performance on my server after backup as executable pages were being swapped out in favor of data waiting to be flushed

...snprintf(buf2, sizeof buf2, fmt, (double)b); n = buf2; break; + case 's': + if (!am_sender) { + b = stats.total_written - + initial_stats->total_written; + } else { + b = stats.total_read - + initial_stats->total_read; + } + strlcat(fmt, "02x", sizeof fmt); + for (...

As I reported a while back rsync doesn't handle metadata (permissions and ownership) in dryrun mode. I offered to make a patch and that offer still stands. I didn't have the time for it until now and want to pick it up again. I had some ugly hack back then but I want to redo it in a clean way. I would like some input on my thoughts. IMHO, it would be ideally if the check for dry_run

> Just curious: what about the rsync+ patch? Thanks for the reminder. I've just committed Jos's rsync+ patch onto the "branch_mbp_rsyncplus_merge" branch. If it works OK and nobody screams I will move it across onto the main tree tomorrow or Wednesday. I see the patch doesn't add documentation about the new options to the man page, so we should fix that in the future.

...if (do_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED) != 0) { + rsyserr(FERROR_XFER, errno, + "fadvise failed in sending %s", + full_fname(fname)); + } + log_item(log_code, file, &initial_stats, iflags, NULL); if (mbuf) { -- 1.7.1

...if (do_fadvise(fd2, 0, 0, POSIX_FADV_DONTNEED) != 0) { + rsyserr(FERROR_XFER, errno, + "fadvise failed in writing %s", + full_fname(fname)); + } + log_item(log_code, file, &initial_stats, iflags, NULL); if (fd1 != -1) -- 1.7.1

...}; --- rsync-2.5.6/receiver.c.orig 2003-01-21 02:32:17 +0300 +++ rsync-2.5.6/receiver.c 2003-01-28 17:41:54 +0300 @@ -319,6 +319,7 @@ int recv_files(int f_in,struct file_list extern int preserve_perms; extern int delete_after; extern int orig_umask; + extern int apt_support; struct stats initial_stats; if (verbose > 2) { @@ -444,6 +445,12 @@ int recv_files(int f_in,struct file_list cleanup_set(fnametmp, fname, file, buf, fd1, fd2); + if (apt_support) { + rprintf(FINFO,"Tmp-Filename: %s\n",fnametmp); + rprintf(FINFO,"Size: %u\n",file->length); + r...

...st *flist); diff -ur rsync-2.5.6/receiver.c rsync-2.5.6-filtered/receiver.c --- rsync-2.5.6/receiver.c 2003-01-21 00:32:17.000000000 +0100 +++ rsync-2.5.6-filtered/receiver.c 2003-11-16 11:44:14.000000000 +0100 @@ -320,11 +320,32 @@ extern int delete_after; extern int orig_umask; struct stats initial_stats; + pid_t pid = 0; /* assignment to get rid of compiler warning */ + int status; + extern char *dest_filter; +#define MAX_FILTER_ARGS 100 + char *filter_argv[MAX_FILTER_ARGS + 1]; if (verbose > 2) { rprintf(FINFO,"recv_files(%d) starting\n",flist->count); } + if (dest_filt...

...,8 @@ int fd1,fd2; STRUCT_STAT st; char *fname; - char fnametmp[MAXPATHLEN]; + char *fnametmp; + char fnametmpbuf[MAXPATHLEN]; char *fnamecmp; char fnamecmpbuf[MAXPATHLEN]; struct map_struct *buf; @@ -314,6 +316,7 @@ extern int preserve_perms; extern int delete_after; struct stats initial_stats; + int write_flags; if (verbose > 2) { rprintf(FINFO,"recv_files(%d) starting\n",flist->count); @@ -404,22 +407,29 @@ buf = NULL; } - if (!get_tmpname(fnametmp,fname)) { - if (buf) unmap_file(buf); - if (fd1 != -1) close(fd1); - continue; - } + if(direct_wri...

..._sum1); + if (md4) { + mdfour_result(&mdfour_data, (unsigned char*)md4); + } read_buf(f_in,file_sum2,MD4_SUM_LENGTH); if (verbose > 2) { @@ -351,6 +361,7 @@ extern int preserve_perms; extern int delete_after; extern int orig_umask; + extern char *link_by_hash_dir; struct stats initial_stats; if (verbose > 2) { @@ -416,7 +427,7 @@ if (fd1 != -1 && do_fstat(fd1,&st) != 0) { rprintf(FERROR, "fstat %s failed: %s\n", full_fname(fnamecmp), strerror(errno)); - receive_data(f_in,NULL,-1,NULL,file->length); + receive_data(f_in,NULL,-1,NULL,file-&...

...d(file_sum1); + if (md4) + mdfour_result(&mdfour_data, (unsigned char*)md4); read_buf(f_in,file_sum2,MD4_SUM_LENGTH); if (verbose > 2) { @@ -299,6 +308,7 @@ extern int preserve_perms; extern int delete_after; extern int orig_umask; + extern char *link_by_hash_dir; struct stats initial_stats; if (verbose > 2) { @@ -372,7 +382,7 @@ if (fd1 != -1 && do_fstat(fd1,&st) != 0) { rprintf(FERROR, "fstat %s failed: %s\n", full_fname(fnamecmp), strerror(errno)); - receive_data(f_in,NULL,-1,NULL,file->length); + receive_data(f_in,NULL,-1,NULL,file-&...

...d(file_sum1); + if (md4) + mdfour_result(&mdfour_data, (unsigned char*)md4); read_buf(f_in,file_sum2,MD4_SUM_LENGTH); if (verbose > 2) { @@ -299,6 +308,7 @@ extern int preserve_perms; extern int delete_after; extern int orig_umask; + extern char *link_by_hash_dir; struct stats initial_stats; if (verbose > 2) { @@ -372,7 +382,7 @@ if (fd1 != -1 && do_fstat(fd1,&st) != 0) { rprintf(FERROR, "fstat %s failed: %s\n", full_fname(fnamecmp), strerror(errno)); - receive_data(f_in,NULL,-1,NULL,file->length); + receive_data(f_in,NULL,-1,NULL,file-&...

...d(file_sum1); + if (md4) + mdfour_result(&mdfour_data, (unsigned char*)md4); read_buf(f_in,file_sum2,MD4_SUM_LENGTH); if (verbose > 2) { @@ -299,6 +308,7 @@ extern int preserve_perms; extern int delete_after; extern int orig_umask; + extern char *link_by_hash_dir; struct stats initial_stats; if (verbose > 2) { @@ -372,7 +382,7 @@ if (fd1 != -1 && do_fstat(fd1,&st) != 0) { rprintf(FERROR, "fstat %s failed: %s\n", full_fname(fnamecmp), strerror(errno)); - receive_data(f_in,NULL,-1,NULL,file->length); + receive_data(f_in,NULL,-1,NULL,file-&...

...d(file_sum1); + if (md4) + mdfour_result(&mdfour_data, (unsigned char*)md4); read_buf(f_in,file_sum2,MD4_SUM_LENGTH); if (verbose > 2) { @@ -299,6 +308,7 @@ extern int preserve_perms; extern int delete_after; extern int orig_umask; + extern char *link_by_hash_dir; struct stats initial_stats; if (verbose > 2) { @@ -372,7 +382,7 @@ if (fd1 != -1 && do_fstat(fd1,&st) != 0) { rprintf(FERROR, "fstat %s failed: %s\n", full_fname(fnamecmp), strerror(errno)); - receive_data(f_in,NULL,-1,NULL,file->length); + receive_data(f_in,NULL,-1,NULL,file-&...

...a/sender.c 15 May 2004 19:31:10 -0000 1.40 --- b/sender.c 17 Jun 2004 04:01:58 -0000 *************** *** 278,284 **** rprintf (FINFO, "filename=%s is being skipped\n", fname); continue; } ! } else { match_sums(f_out, s, mbuf, st.st_size); log_send(file, &initial_stats); } --- 278,284 ---- rprintf (FINFO, "filename=%s is being skipped\n", fname); continue; } ! } else { /* not read_batch */ match_sums(f_out, s, mbuf, st.st_size); log_send(file, &initial_stats); } Index: token.c ===================================...

...17:42.%N -0700 +++ rsync-2.6.3/sender.c 2005-03-19 12:26:03.%N -0800 @@ -29,6 +29,9 @@ extern int protocol_version; extern int make_backups; extern struct stats stats; +extern int write_batch; +extern int offline; +extern int write_batch_monitor_out; /** @@ -123,16 +126,27 @@ struct stats initial_stats; int save_make_backups = make_backups; int j; + int f_alt, old_monitor; if (verbose > 2) rprintf(FINFO, "send_files starting\n"); + old_monitor = write_batch_monitor_out; + if (write_batch && offline) { + /* offline send: don't send tokens over wire */ + f_al...

...-1,NULL,file->length); if (buf) unmap_file(buf); if (fd1 != -1) close(fd1); continue; @@ -449,7 +449,7 @@ } /* recv file data */ - recv_ok = receive_data(f_in,buf,fd2,fname,file->length); + recv_ok = recv_data(f_in,buf,fd2,fname,file->length); log_recv(file, &initial_stats); --- rsync-2.5.6.org/batch.c Tue Dec 24 08:42:04 2002 +++ rsync-2.5.6/batch.c Fri Feb 21 16:45:47 2003 @@ -8,6 +8,10 @@ #include "rsync.h" #include <time.h> +#ifndef S_IEXEC +# define S_IEXEC 0x040 +#endif + extern char *batch_prefix; struct file_list *batch_flist; ----...

...tch_sums()\n"); + match_sums(f_out,s,buf); + if (read_devices && (S_ISFIFO(st.st_mode) || S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode))) { + /* For FIFO and device files know the file size only now -- update stats. */ + stats.total_size += buf->file_size; + initial_stats.total_size += buf->file_size; + } log_send(file, &initial_stats); } if (!read_batch) { /* dw */ diff -r -u4 rsync-2.5.5/token.c rsync-patched/token.c --- rsync-2.5.5/token.c Tue Aug 14 05:04:49 2001 +++ rsync-patched/token.c Mon Aug 5 10:05:15 2002 @@ -85,2...