search for: local_serv

Dear List, the attached patch makes rsync of local folders almost as fast as cp. when rsync client and server has detected that they are working in local_server mode, they use local_socket, a unix domain socket pair, to pass the file descriptors of the synced files. the server uses the file descriptor it receives from the client to fast copy from src to dst file. on completion of every file fast copy the server ACKs the client back on the local_socket, t...

...================================================ RCS file: /cvsroot/rsync/generator.c,v retrieving revision 1.87 diff -c -b -d -r1.87 generator.c *** a/generator.c 11 Jun 2004 07:40:51 -0000 1.87 --- b/generator.c 17 Jun 2004 04:01:55 -0000 *************** *** 48,53 **** --- 48,54 ---- extern int local_server; extern int read_batch; extern int write_batch; + extern int read_batch; extern int list_only; extern int only_existing; extern int orig_umask; *************** *** 124,132 **** /* * set (initialize) the size entries in the per-file sum_struct ! * calulating dynamic block ans c...

...) ? 0 : io_error); + } + } struct file_list *recv_file_list(int f) { diff -E -B -c -r rsync-2.5.6/main.c rsync-2.5.6-remotebatch/main.c *** rsync-2.5.6/main.c Tue Jan 28 05:05:53 2003 --- rsync-2.5.6-remotebatch/main.c Wed Jul 23 15:55:18 2003 *************** *** 263,270 **** } if (local_server) { - if (read_batch) - create_flist_from_batch(); /* sets batch_flist */ ret = local_child(argc, args, f_in, f_out, child_main); } else { ret = piped_child(args,f_in,f_out); --- 263,268 ---- *************** *** 505,515 **** if (delete_mode && !delete_excluded)...

...0; /* Start ofc PFC patched section to handle the of the whole command under cygwin rsh ---------------------------------------------------- */ char *other_args[100] ; int other_argc = 0 ; char the_cmd[1024] ; /* End of PFC patched section */ if (!read_batch && !local_server) { char *rsh_env = getenv(RSYNC_RSH_ENV); if (!cmd) cmd = rsh_env; if (!cmd) cmd = RSYNC_RSH; cmd = strdup(cmd); if (!cmd) goto oom; for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) args[argc++] = tok; /* check to see if we've already...

...rsync code? -------------- next part -------------- diff -ru rsync-2.5.5.orig/generator.c rsync-2.5.5/generator.c --- rsync-2.5.5.orig/generator.c Mon Mar 25 07:54:31 2002 +++ rsync-2.5.5/generator.c Sun Jun 2 20:25:54 2002 @@ -141,6 +141,7 @@ extern int whole_file, no_whole_file; extern int local_server; extern int write_batch; + extern int read_batch; assert(whole_file == 0 || whole_file == 1); @@ -150,7 +151,7 @@ return True; else if (no_whole_file) return False; - else if (write_batch) + else if (write_batch || read_batch) return False; else return local_server;

> 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.

...*p = 0; + path = p+1; + } else { + path=""; + } + p = strchr(host,':'); + if (p) { + rsync_port = atoi(p+1); + *p = 0; + } + return start_socket_client(host, path, argc-1, argv); + } + p = find_colon(argv[argc-1]); if (!p) { + /* Local copy. */ local_server = 1; } else if (p[1] == ':') { + /* Last paramter is HOST::MODULE. + * Send to remote rsyncd server. */ *p = 0; return start_socket_client(argv[argc-1], p+2, argc-1, argv); } @@ -726,6 +756,8 @@ exit_cleanup(RERR_SYNTAX); } + /* Last parameter is HOST:MODULE...

...================================= RCS file: /cvsroot/rsync/main.c,v retrieving revision 1.139 diff -u -r1.139 main.c --- main.c 5 Feb 2002 23:05:32 -0000 1.139 +++ main.c 6 Feb 2002 19:48:04 -0000 @@ -177,7 +177,7 @@ extern int blocking_io; extern int read_batch; - if (!read_batch && !local_server) { /* dw -- added read_batch */ + if (!read_batch && !local_server) { if (!cmd) cmd = getenv(RSYNC_RSH_ENV); if (!cmd) @@ -230,7 +230,7 @@ if (local_server) { if (read_batch) - create_flist_from_batch(); + create_flist_from_batch(); /* sets batch_flist */ ret...

...argc--; argv++; } else { + who_am_i = "sender"; am_sender = 1; /* rsync:// destination uses rsync server over direct socket */ @@ -817,6 +822,7 @@ static int start_client(int argc, char * argc--; } } else { + who_am_i = "sender"; am_sender = 1; local_server = 1; shell_path = argv[argc-1]; --- options.c 23 Jan 2004 09:32:50 -0000 1.127 +++ options.c 27 Jan 2004 08:00:54 -0000 @@ -66,6 +66,7 @@ int read_only = 0; int module_id = -1; int am_server = 0; int am_sender = 0; +char *who_am_i = "receiver"; char *files_from = NULL; int files...

...g that looks like ssh. Perhaps that could be done cleaner... Paul Slootman --- a/main.c 2008-03-01 21:01:41.000000000 +0100 +++ b/main.c 2008-03-04 18:55:10.933488013 +0100 @@ -82,6 +82,7 @@ #ifdef ICONV_OPTION extern iconv_t ic_send; #endif +extern int default_af_hint; uid_t our_uid; int local_server = 0; @@ -381,6 +382,23 @@ *t++ = '\0'; } +#ifdef AF_INET + if (default_af_hint == AF_INET) { + if (strncmp(cmd, "ssh", 3) == 0 || strstr(cmd, "/ssh") != NULL) { + /* we're using ssh so we can add a -...

Hi NG, I want to do incremental backups to a remote server running rsyncd (because daemonless transfer via ssh often hangs!). In contrast to transfer via ssh (without remote rsyncd) this doesn't seem possible, or do I miss something? Imagine I want to incrementally backup `mydir' to the backup space `backup' on e remote server `alpha' running an rsync daemon. rsyncd on

...S" days. We modfied "options.c" and "receiver.c" from version 2.6.3. Best regards, Marko Riedel *** options.c Tue Oct 5 15:46:00 2004 --- /tmp/rsync-2.6.3/options.c Thu Sep 23 19:39:05 2004 *************** *** 52,62 **** int cvs_exclude = 0; int dry_run = 0; int local_server = 0; int ignore_times = 0; int delete_mode = 0; - int delete_mdays = -1; int delete_excluded = 0; int one_file_system = 0; int protocol_version = PROTOCOL_VERSION; int sparse_files = 0; int do_compression = 0; --- 52,61 ---- *************** *** 263,273 **** rprintf(F," -e,...

...iff -ru rsync-2.5.6cvs/options.c rsync-2.5.6cvsJ/options.c --- rsync-2.5.6cvs/options.c Tue Jan 14 09:35:25 2003 +++ rsync-2.5.6cvsJ/options.c Tue Jan 14 09:35:40 2003 @@ -45,6 +45,7 @@ int preserve_times = 0; int update_only = 0; int cvs_exclude = 0; +int rsync_exclude = 0; int dry_run=0; int local_server=0; int ignore_times=0; @@ -237,6 +238,7 @@ rprintf(F," -e, --rsh=COMMAND specify the remote shell\n"); rprintf(F," --rsync-path=PATH specify path to rsync on the remote machine\n"); rprintf(F," -C, --cvs-exclude auto ignore files in...

...rrections that have + * to record a canonical (independent of server-ness) record + * of the transmission, and read_batch corrections that have + * to replay this canonical record. + */ + if (am_server) { if (am_sender) { int64 w; *************** *** 300,307 **** } if (local_server) { - if (read_batch) - create_flist_from_batch(); /* sets batch_flist */ ret = local_child(argc, args, f_in, f_out, child_main); } else { ret = piped_child(args,f_in,f_out); --- 321,326 ---- *************** *** 461,466 **** --- 480,491 ---- recv_files(f_in,flist,local_name)...

...======================= RCS file: /juno/repository/usr/local/pkg/rsync/main.c,v retrieving revision 1.1.1.6 retrieving revision 1.4 diff -c -b -r1.1.1.6 -r1.4 *** main.c 2001/10/19 04:09:33 1.1.1.6 --- main.c 2001/11/19 20:31:47 1.4 *************** *** 126,131 **** --- 126,132 ---- extern int local_server; extern char *rsync_path; extern int blocking_io; + extern int run_inband; if (!local_server) { if (!cmd) *************** *** 165,172 **** --- 166,175 ---- args[argc++] = "."; + if (!run_inband) { if (path && *path)...

...ne _(String) gettext (String) ... so that the code becomes as follows. extern struct filter_list_struct daemon_filter_list; uid_t our_uid; int am_receiver = 0; /* Only set to 1 after the receiver/generator fork. */ int am_generator = 0; /* Only set to 1 after the receiver/generator fork. */ int local_server = 0; int daemon_over_rsh = 0; mode_t orig_umask = 0; int batch_gen_fd = -1; /* Following line added for Localisation. */ #define _(String) gettext (String) /* There's probably never more than at most 2 outstanding child processes, * but set it higher, just in case. */ #define MAXCHILDPROCS...

...diff -ru rsync-2.5.6/options.c rsync-2.5.6J/options.c --- rsync-2.5.6/options.c Mon Jan 27 20:11:57 2003 +++ rsync-2.5.6J/options.c Thu Feb 13 11:13:01 2003 @@ -45,6 +45,7 @@ int preserve_times = 0; int update_only = 0; int cvs_exclude = 0; +const char *rsync_exclude = NULL; int dry_run=0; int local_server=0; int ignore_times=0; @@ -84,7 +85,6 @@ int modify_window=0; int blocking_io=-1; - /** Network address family. **/ #ifdef INET6 int default_af_hint = 0; /* Any protocol */ @@ -233,6 +233,7 @@ rprintf(F," -e, --rsh=COMMAND specify the remote shell\n"); rprintf(F,...

...diff --git a/options.c b/options.c index e5b0cb68280ed..07e3f1e5d0ac1 100644 --- a/options.c +++ b/options.c @@ -23,6 +23,9 @@ #include "itypes.h" #include <popt.h> #include <zlib.h> +#ifdef HAVE_LIBZSTD +#include <zstd.h> +#endif extern int module_id; extern int local_server; @@ -77,6 +80,7 @@ int protocol_version = PROTOCOL_VERSION; int sparse_files = 0; int preallocate_files = 0; int do_compression = 0; +int do_compression_zstd = 0; int def_compress_level = NOT_SPECIFIED; int am_root = 0; /* 0 = normal, 1 = root, 2 = --super, -1 = --fake-super */ int am_serve...

.../* if always checksum is set then we use the checksum instead diff -ur rsync-2.5.6/options.c rsync-2.5.6-filtered/options.c --- rsync-2.5.6/options.c 2003-01-28 04:11:57.000000000 +0100 +++ rsync-2.5.6-filtered/options.c 2003-11-16 14:06:29.000000000 +0100 @@ -48,6 +48,9 @@ int dry_run=0; int local_server=0; int ignore_times=0; +char *source_filter = NULL; +char *dest_filter = NULL; +int times_only=0; int delete_mode=0; int delete_excluded=0; int one_file_system=0; @@ -246,6 +249,7 @@ rprintf(F," --timeout=TIME set IO timeout in seconds\n"); rprintf(F," -I, --...

...ERR_STREAMIO); + } + read_loop(fd, line, 4); + successful_send(IVAL(line, 0)); + remaining = 0; break; case MSG_INFO: case MSG_ERROR: Index: main.c --- main.c 17 Jan 2004 05:04:04 -0000 1.181 +++ main.c 17 Jan 2004 05:04:54 -0000 @@ -41,6 +41,7 @@ extern int list_only; extern int local_server; extern int log_got_error; extern int module_id; +extern int need_messages_from_generator; extern int orig_umask; extern int preserve_hard_links; extern int protocol_version; @@ -558,6 +559,8 @@ void start_server(int f_in, int f_out, i io_start_multiplex_out(f_out); if (am_sender) { +...