diff options
| author | David Disseldorp <ddiss@suse.de> | 2011-08-08 16:35:56 +0200 |
|---|---|---|
| committer | David Disseldorp <ddiss@suse.de> | 2011-09-06 13:57:04 +0200 |
| commit | 5296da5609fcab1f24ea4d5578988acd831c5248 (patch) | |
| tree | fb9056530115bf409ea231cbcb12b9e9d469a4e2 /ctdb/client/ctdb_client.c | |
| parent | 0628d1c0e698e754bada494312a64b2dad65f25c (diff) | |
| download | samba-5296da5609fcab1f24ea4d5578988acd831c5248.tar.gz samba-5296da5609fcab1f24ea4d5578988acd831c5248.tar.xz samba-5296da5609fcab1f24ea4d5578988acd831c5248.zip | |
client: add timeout argument to ctdb_attach
Rather than using a fixed 2 second CTDB_CONTROL_GETDBPATH timeout.
(This used to be ctdb commit 9e178671560cb95121e11d718a76b05380ecd6c5)
Diffstat (limited to 'ctdb/client/ctdb_client.c')
| -rw-r--r-- | ctdb/client/ctdb_client.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 55c32735d9..bd0e800b0e 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -1696,7 +1696,11 @@ static int ctdb_fetch_func(struct ctdb_call_info *call) /* attach to a specific database - client call */ -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) { struct ctdb_db_context *ctdb_db; TDB_DATA data; @@ -1731,7 +1735,7 @@ struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, const char *name, ctdb_db->db_id = *(uint32_t *)data.dptr; talloc_free(data.dptr); - ret = ctdb_ctrl_getdbpath(ctdb, timeval_current_ofs(2, 0), CTDB_CURRENT_NODE, ctdb_db->db_id, ctdb_db, &ctdb_db->db_path); + ret = ctdb_ctrl_getdbpath(ctdb, timeout, CTDB_CURRENT_NODE, ctdb_db->db_id, ctdb_db, &ctdb_db->db_path); if (ret != 0) { DEBUG(DEBUG_ERR,("Failed to get dbpath for database '%s'\n", name)); talloc_free(ctdb_db); |