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/client/ctdb_client.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/client/ctdb_client.c')
| -rw-r--r-- | ctdb/client/ctdb_client.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 55c32735d9..0828e989d2 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -186,7 +186,7 @@ static void ctdb_client_reply_control(struct ctdb_context *ctdb, struct ctdb_req /* this is called in the client, when data comes in from the daemon */ -static void ctdb_client_read_cb(uint8_t *data, size_t cnt, void *args) +void ctdb_client_read_cb(uint8_t *data, size_t cnt, void *args) { struct ctdb_context *ctdb = talloc_get_type(args, struct ctdb_context); struct ctdb_req_header *hdr = (struct ctdb_req_header *)data; @@ -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); |