diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-31 16:52:56 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-31 17:07:41 +0200 |
| commit | 5648c3f67eeebee0a17cf9e7b64fb2cbfe2e2e68 (patch) | |
| tree | 4623f3f0cb705b3151febb3c1952b8925b44b1ff /source3/lib/dbwrap_ctdb.c | |
| parent | 808ceac9f54bb3988fc2bb6b0d86eaded07283e1 (diff) | |
| download | samba-5648c3f67eeebee0a17cf9e7b64fb2cbfe2e2e68.tar.gz samba-5648c3f67eeebee0a17cf9e7b64fb2cbfe2e2e68.tar.bz2 samba-5648c3f67eeebee0a17cf9e7b64fb2cbfe2e2e68.zip | |
s3: messaging_ctdbd_connection() was only called with procid_self()
Eventually we'll get this right...
Diffstat (limited to 'source3/lib/dbwrap_ctdb.c')
| -rw-r--r-- | source3/lib/dbwrap_ctdb.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c index ceaadd2256..67425dcb79 100644 --- a/source3/lib/dbwrap_ctdb.c +++ b/source3/lib/dbwrap_ctdb.c @@ -794,7 +794,7 @@ static int db_ctdb_transaction_commit(struct db_context *db) again: /* tell ctdbd to commit to the other nodes */ - rets = ctdbd_control_local(messaging_ctdbd_connection(procid_self()), + rets = ctdbd_control_local(messaging_ctdbd_connection(), CTDB_CONTROL_TRANS3_COMMIT, h->ctx->db_id, 0, db_ctdb_marshall_finish(h->m_write), @@ -1005,9 +1005,8 @@ again: ((struct ctdb_ltdb_header *)ctdb_data.dptr)->dmaster : -1, get_my_vnn())); - status = ctdbd_migrate( - messaging_ctdbd_connection(procid_self()), ctx->db_id, - key); + status = ctdbd_migrate(messaging_ctdbd_connection(), ctx->db_id, + key); if (!NT_STATUS_IS_OK(status)) { DEBUG(5, ("ctdb_migrate failed: %s\n", nt_errstr(status))); @@ -1112,8 +1111,8 @@ static int db_ctdb_fetch(struct db_context *db, TALLOC_CTX *mem_ctx, SAFE_FREE(ctdb_data.dptr); /* we weren't able to get it locally - ask ctdb to fetch it for us */ - status = ctdbd_fetch(messaging_ctdbd_connection(procid_self()), - ctx->db_id, key, mem_ctx, data); + status = ctdbd_fetch(messaging_ctdbd_connection(), ctx->db_id, key, + mem_ctx, data); if (!NT_STATUS_IS_OK(status)) { DEBUG(5, ("ctdbd_fetch failed: %s\n", nt_errstr(status))); return -1; @@ -1291,7 +1290,7 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx, db_ctdb->transaction = NULL; db_ctdb->db = result; - conn = messaging_ctdbd_connection(procid_self()); + conn = messaging_ctdbd_connection(); if (conn == NULL) { DEBUG(1, ("Could not connect to ctdb\n")); TALLOC_FREE(result); |