diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-09-08 11:22:53 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-09-08 11:22:53 +1000 |
| commit | 1c05db2c9c0173ab30958cd5afceb46efb4b11c4 (patch) | |
| tree | 6fb8d04fce7481494345b07d52a24f0d6dc7b289 /ctdb/common/cmdline.c | |
| parent | b0fdfd8ec9a035c4c66e6a146b43f9a0a27da707 (diff) | |
| parent | 66f92be635f5d001fb82517175f44cc72fe7db61 (diff) | |
| download | samba-1c05db2c9c0173ab30958cd5afceb46efb4b11c4.tar.gz samba-1c05db2c9c0173ab30958cd5afceb46efb4b11c4.tar.xz samba-1c05db2c9c0173ab30958cd5afceb46efb4b11c4.zip | |
Merge remote branch 'ddiss/master_pmda_and_client_timeouts'
(This used to be ctdb commit 7bebfc7bad8f36e54003b8e25372fdaf54836e21)
Diffstat (limited to 'ctdb/common/cmdline.c')
| -rw-r--r-- | ctdb/common/cmdline.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ctdb/common/cmdline.c b/ctdb/common/cmdline.c index 145a13a81b..5c00763ed7 100644 --- a/ctdb/common/cmdline.c +++ b/ctdb/common/cmdline.c @@ -111,7 +111,8 @@ struct ctdb_context *ctdb_cmdline_init(struct event_context *ev) /* startup a client only ctdb context */ -struct ctdb_context *ctdb_cmdline_client(struct event_context *ev) +struct ctdb_context *ctdb_cmdline_client(struct tevent_context *ev, + struct timeval req_timeout) { struct ctdb_context *ctdb; char *socket_name; @@ -152,7 +153,7 @@ struct ctdb_context *ctdb_cmdline_client(struct event_context *ev) } /* get our pnn */ - ctdb->pnn = ctdb_ctrl_getpnn(ctdb, timeval_current_ofs(3, 0), CTDB_CURRENT_NODE); + ctdb->pnn = ctdb_ctrl_getpnn(ctdb, req_timeout, CTDB_CURRENT_NODE); if (ctdb->pnn == (uint32_t)-1) { DEBUG(DEBUG_CRIT,(__location__ " Failed to get ctdb pnn\n")); talloc_free(ctdb); |