[PATCH] time limit
John Taylor
john at fcs.uga.edu
Mon Apr 19 20:28:08 GMT 2004
Greetings,
I have written a patch for rsync-2.6.1pre-2 which adds a --time-limit=T
option. When this option is used rsync will stop after T minutes
and exit. I think this option is useful when rsyncing a large amount
of data during the night (non-busy hours), and then stopping when it is
time for people to start using the network, during the day (busy hours).
If this patch is accepted it may need some tweaking by the
rsync core developers as I am not too familiar with the code base.
The url is http://www.terry.uga.edu/~jft/rsync-timelimit.patch.gz
And it is posted below as well.
Thanks,
-John
diff -urN rsync-2.6.1pre-2/NEWS rsync-2.6.1pre-2_modified/NEWS
--- rsync-2.6.1pre-2/NEWS 2004-04-15 14:23:52.000000000 -0400
+++ rsync-2.6.1pre-2_modified/NEWS 2004-04-19 16:07:57.000000000 -0400
@@ -23,6 +23,9 @@
* Added a couple extra diffs in the "patches" dir, removed the
ones that got applied, and rebuilt the rest.
+ * Added --time-limit=T which will stop rsync after T number
+ of minutes
+
BUG FIXES:
* When -x (--one-file-system) is combined with -L (--copy-links)
diff -urN rsync-2.6.1pre-2/io.c rsync-2.6.1pre-2_modified/io.c
--- rsync-2.6.1pre-2/io.c 2004-01-16 11:31:47.000000000 -0500
+++ rsync-2.6.1pre-2_modified/io.c 2004-04-19 16:07:57.000000000 -0400
@@ -47,6 +47,7 @@
static int no_flush;
extern int bwlimit;
+extern int timelimit;
extern int verbose;
extern int io_timeout;
extern int am_server;
@@ -759,6 +760,26 @@
select(0, NULL, NULL, NULL, &tv);
}
+/**
+ When --timelimit is used, compare rsync_start_time and the current time and
+ return 1 when the timelimit has been reached.
+ **/
+static int has_timelimit_expired()
+{
+ struct timeval tv;
+ time_t start_time = 0;
+ time_t expiration_time = 0;
+
+ assert(timelimit > 0);
+
+ start_time = get_rsync_start_time();
+ assert( start_time > 0);
+
+ gettimeofday(&tv, NULL);
+ expiration_time = start_time + (timelimit * 60);
+
+ return ( tv.tv_sec > expiration_time ) ? 1 : 0;
+}
/**
* Write len bytes to the file descriptor @p fd.
@@ -772,6 +793,7 @@
fd_set w_fds, r_fds;
int fd_count, count;
struct timeval tv;
+ int time_expired = 0;
msg_list_push(NORMAL_FLUSH);
@@ -837,6 +859,14 @@
}
sleep_for_bwlimit(ret);
+ if( timelimit ) {
+ time_expired = has_timelimit_expired();
+ if( 1 == time_expired ) {
+ rprintf(FERROR, RSYNC_NAME ": \n%d minute time limit exceeded.\n", timelimit);
+ exit_cleanup(RERR_PARTIAL);
+ }
+ }
+
total += ret;
diff -urN rsync-2.6.1pre-2/options.c rsync-2.6.1pre-2_modified/options.c
--- rsync-2.6.1pre-2/options.c 2004-04-17 13:07:23.000000000 -0400
+++ rsync-2.6.1pre-2_modified/options.c 2004-04-19 16:07:57.000000000 -0400
@@ -83,6 +83,7 @@
int copy_unsafe_links = 0;
int size_only = 0;
int bwlimit = 0;
+int timelimit = 0;
int delete_after = 0;
int only_existing = 0;
int opt_ignore_existing = 0;
@@ -288,6 +289,7 @@
rprintf(F," --log-format=FORMAT log file transfers using specified format\n");
rprintf(F," --password-file=FILE get password from FILE\n");
rprintf(F," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n");
+ rprintf(F," --timelimit=T Stop rsync after T minutes\n");
rprintf(F," --write-batch=PREFIX write batch fileset starting with PREFIX\n");
rprintf(F," --read-batch=PREFIX read batch fileset starting with PREFIX\n");
rprintf(F," -h, --help show this help screen\n");
@@ -377,6 +379,7 @@
{"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 },
{"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 },
{"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 },
+ {"timelimit", 0, POPT_ARG_INT, &timelimit, 0, 0, 0 },
{"address", 0, POPT_ARG_STRING, &bind_address, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
{"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 0, 0 },
@@ -885,6 +888,12 @@
args[ac++] = arg;
}
+ if (timelimit) {
+ if (asprintf(&arg, "--timelimit=%d", timelimit) < 0)
+ goto oom;
+ args[ac++] = arg;
+ }
+
if (backup_dir) {
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
diff -urN rsync-2.6.1pre-2/proto.h rsync-2.6.1pre-2_modified/proto.h
--- rsync-2.6.1pre-2/proto.h 2004-04-14 19:33:30.000000000 -0400
+++ rsync-2.6.1pre-2_modified/proto.h 2004-04-19 16:07:57.000000000 -0400
@@ -267,6 +267,7 @@
int unsafe_symlink(const char *dest, const char *src);
char *timestring(time_t t);
int msleep(int t);
+time_t get_rsync_start_time(void);
int cmp_modtime(time_t file1, time_t file2);
int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6);
void *_new_array(unsigned int size, unsigned long num);
diff -urN rsync-2.6.1pre-2/rsync.1 rsync-2.6.1pre-2_modified/rsync.1
--- rsync-2.6.1pre-2/rsync.1 2004-04-17 14:38:47.000000000 -0400
+++ rsync-2.6.1pre-2_modified/rsync.1 2004-04-19 16:07:57.000000000 -0400
@@ -383,6 +383,7 @@
--log-format=FORMAT log file transfers using specified format
--password-file=FILE get password from FILE
--bwlimit=KBPS limit I/O bandwidth, KBytes per second
+ --timelimit=T Stop rsync after T minutes
--write-batch=PREFIX write batch fileset starting with PREFIX
--read-batch=PREFIX read batch fileset starting with PREFIX
-h, --help show this help screen
@@ -1026,6 +1027,11 @@
transfer was too fast, it will wait before sending the next data block\&. The
result is an average transfer rate equaling the specified limit\&. A value
of zero specifies no limit\&.
+.IP
+.IP "\fB--timelimit=T\fP"
+This option allows you to specify the maximum
+number of minutes rsync will run for\&. Ths time starts when the first file starts
+transferring\&.
.IP
.IP "\fB--write-batch=PREFIX\fP"
Generate a set of files that can be
diff -urN rsync-2.6.1pre-2/util.c rsync-2.6.1pre-2_modified/util.c
--- rsync-2.6.1pre-2/util.c 2004-04-17 13:06:03.000000000 -0400
+++ rsync-2.6.1pre-2_modified/util.c 2004-04-19 16:07:57.000000000 -0400
@@ -1050,6 +1050,22 @@
return True;
}
+/**
+ * Return the time that rsync is started, used by --time-limit
+ **/
+time_t get_rsync_start_time(void)
+{
+ static struct timeval tval;
+ static int has_set_rsync_start_time = 0;
+
+ if( ! has_set_rsync_start_time ) {
+ gettimeofday(&tval, NULL);
+ has_set_rsync_start_time = 1;
+ }
+
+ return tval.tv_sec;
+}
/**
* Determine if two file modification times are equivalent (either
More information about the rsync
mailing list