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/include/ctdb_client.h | |
| 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/include/ctdb_client.h')
| -rw-r--r-- | ctdb/include/ctdb_client.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ctdb/include/ctdb_client.h b/ctdb/include/ctdb_client.h index 3dc115f0cc..95b907378a 100644 --- a/ctdb/include/ctdb_client.h +++ b/ctdb/include/ctdb_client.h @@ -105,7 +105,12 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog, /* attach to a ctdb database */ -struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, const char *name, bool persistent, uint32_t tdb_flags); +struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, + struct timeval timeout, + const char *name, + bool persistent, + uint32_t tdb_flags); + /* find an attached ctdb_db handle given a name @@ -188,7 +193,8 @@ int ctdb_register_message_handler(struct ctdb_context *ctdb, struct ctdb_db_context *find_ctdb_db(struct ctdb_context *ctdb, uint32_t id); -struct ctdb_context *ctdb_cmdline_client(struct tevent_context *ev); +struct ctdb_context *ctdb_cmdline_client(struct tevent_context *ev, + struct timeval req_timeout); struct ctdb_statistics; int ctdb_ctrl_statistics(struct ctdb_context *ctdb, uint32_t destnode, struct ctdb_statistics *status); |