From 571ec7893c8b40959c005d510c039e3f231ffc67 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 8 Aug 2008 13:12:16 +1000 Subject: [PATCH] use CTDB_CONTROL_TRANS2_COMMIT_RETRY to prevent the counter getting out of sync --- source/lib/dbwrap_ctdb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/lib/dbwrap_ctdb.c b/source/lib/dbwrap_ctdb.c index 8261e2f7330..049e1b9584d 100644 --- a/source/lib/dbwrap_ctdb.c +++ b/source/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); -- 2.47.3