diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-09-18 16:35:18 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-09-19 12:56:50 +1000 |
| commit | 236b2524de5b68b60f70db6ef3c3b78604976deb (patch) | |
| tree | 5f0ab1a65c0b150551eac62fa0f950a49212bcfe /ctdb/tools | |
| parent | 5f0d85d4db08b9de1eee35b161a4d1a05b43d77c (diff) | |
| download | samba-236b2524de5b68b60f70db6ef3c3b78604976deb.tar.gz samba-236b2524de5b68b60f70db6ef3c3b78604976deb.tar.xz samba-236b2524de5b68b60f70db6ef3c3b78604976deb.zip | |
tools/ctdb: Use the standard long timeout when disabling takeover runs
This means that takeover runs will be disabled for about as long as the
reloadips control can take to complete.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 6d44657a5e5b0df22bab2d487a503dd1c5ba79b4)
Diffstat (limited to 'ctdb/tools')
| -rw-r--r-- | ctdb/tools/ctdb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index a72f0eea37..d67975a874 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -54,8 +54,10 @@ static struct { int printrecordflags; } options; +#define LONGTIMEOUT options.timelimit*10 + #define TIMELIMIT() timeval_current_ofs(options.timelimit, 0) -#define LONGTIMELIMIT() timeval_current_ofs(options.timelimit*10, 0) +#define LONGTIMELIMIT() timeval_current_ofs(LONGTIMEOUT, 0) static int control_version(struct ctdb_context *ctdb, int argc, const char **argv) { @@ -4314,7 +4316,7 @@ again: * there are disconnected nodes. However, this should * probably be left up to the administrator. */ - srvid_broadcast(ctdb, CTDB_SRVID_DISABLE_TAKEOVER_RUNS, 60, + srvid_broadcast(ctdb, CTDB_SRVID_DISABLE_TAKEOVER_RUNS, LONGTIMEOUT, "Disable takeover runs", true); /* Now tell all the desired nodes to reload their public IPs. |