summaryrefslogtreecommitdiffstats
path: root/ctdb/server/ctdb_control.c
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronniesahlberg@gmail.com>2011-02-23 15:46:36 +1100
committerRonnie Sahlberg <ronniesahlberg@gmail.com>2011-03-01 12:13:34 +1100
commit8acb677c9c225e69cad9343d62394814798a47cb (patch)
tree871e77484f83a6d69aa6a6f4d33ea20f3bad75eb /ctdb/server/ctdb_control.c
parente00ca55fa470d4f7751b2eb0ef36caf2bed9708d (diff)
downloadsamba-8acb677c9c225e69cad9343d62394814798a47cb.tar.gz
samba-8acb677c9c225e69cad9343d62394814798a47cb.tar.xz
samba-8acb677c9c225e69cad9343d62394814798a47cb.zip
Deferred attach : at early startup, defer any db attach calls until we are out of recovery.
(This used to be ctdb commit eeaabd579841f60ab2c5b004cbbb1f5de2bfe685)
Diffstat (limited to 'ctdb/server/ctdb_control.c')
-rw-r--r--ctdb/server/ctdb_control.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index 90900c94b1d..69724e39657 100644
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -221,10 +221,10 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
}
case CTDB_CONTROL_DB_ATTACH:
- return ctdb_control_db_attach(ctdb, indata, outdata, srvid, false);
+ return ctdb_control_db_attach(ctdb, indata, outdata, srvid, false, client_id, c, async_reply);
case CTDB_CONTROL_DB_ATTACH_PERSISTENT:
- return ctdb_control_db_attach(ctdb, indata, outdata, srvid, true);
+ return ctdb_control_db_attach(ctdb, indata, outdata, srvid, true, client_id, c, async_reply);
case CTDB_CONTROL_SET_CALL: {
struct ctdb_control_set_call *sc =