From: Michael Adam <obnox@samba.org>
Date: Tue, 22 Feb 2011 23:03:07 +0000 (+0100)
Subject: persistent: reject trans3_control when a commit is already active.
X-Git-Url: http://git.samba.org/?p=sahlberg%2Fctdb.git;a=commitdiff_plain;h=4c01d6738532696cb83fc2074849ca771029e960

persistent: reject trans3_control when a commit is already active.

This should actually never happen.
---

diff --git a/server/ctdb_persistent.c b/server/ctdb_persistent.c
index e299c9fa..c7a53ca0 100644
--- a/server/ctdb_persistent.c
+++ b/server/ctdb_persistent.c
@@ -310,6 +310,14 @@ int32_t ctdb_control_trans3_commit(struct ctdb_context *ctdb,
 		return -1;
 	}
 
+	if (ctdb_db->persistent_state != NULL) {
+		DEBUG(DEBUG_ERR, (__location__ " Error: "
+				  "ctdb_control_trans3_commit "
+				  "called while a transaction commit is "
+				  "active. db_id[0x%08x]\n", m->db_id));
+		return -1;
+	}
+
 	client = ctdb_reqid_find(ctdb, c->client_id, struct ctdb_client);
 	if (client == NULL) {
 		DEBUG(DEBUG_ERR,(__location__ " can not match persistent_store "