From ca64c340c735fa075c0259e5fa61982a2e3a1c5a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 8 Aug 2008 13:12:16 +1000 Subject: use CTDB_CONTROL_TRANS2_COMMIT_RETRY to prevent the counter getting out of sync (This used to be commit 571ec7893c8b40959c005d510c039e3f231ffc67) --- source3/lib/dbwrap_ctdb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c index 8261e2f733..049e1b9584 100644 --- a/source3/lib/dbwrap_ctdb.c +++ b/source3/lib/dbwrap_ctdb.c @@ -646,8 +646,9 @@ again: /* tell ctdbd to commit to the other nodes */ rets = ctdbd_control_local(messaging_ctdbd_connection(), - CTDB_CONTROL_TRANS2_COMMIT, h->ctx->db_id, 0, - db_ctdb_marshall_finish(h->m_write), NULL, NULL, &status); + retries==0?CTDB_CONTROL_TRANS2_COMMIT:CTDB_CONTROL_TRANS2_COMMIT_RETRY, + h->ctx->db_id, 0, + db_ctdb_marshall_finish(h->m_write), NULL, NULL, &status); if (!NT_STATUS_IS_OK(rets) || status != 0) { tdb_transaction_cancel(h->ctx->wtdb->tdb); sleep(1); -- cgit