[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 3.4.2-ctdb-13-5-gb296ac8

[Michael Adam]

The branch, v3-4-ctdb has been updated
       via  b296ac84125be1d8f4d43aa89ec5b4cdc60df3e6 (commit)
       via  51e4c2db0fc1294669b56f4536e7e913297713ab (commit)
      from  ea9d98bea833e7629616484262951ab4de8f4d95 (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb


- Log -----------------------------------------------------------------
commit b296ac84125be1d8f4d43aa89ec5b4cdc60df3e6
Author: Michael Adam <obnox at samba.org>
Date:   Fri Dec 4 14:53:05 2009 +0100

    s3:dbwrap_ctdb: increase the number of commit retries 5-->100
    
    This is to cope with timeouts when recoveries and transactions collide.
    Maybe 100 is too hight, but 10 or even 20 have been too low in a
    very busy environment.
    
    Michael

commit 51e4c2db0fc1294669b56f4536e7e913297713ab
Author: Michael Adam <obnox at samba.org>
Date:   Fri Dec 4 14:49:53 2009 +0100

    s3:dbwrap_ctdb: increase the rsn of the __transaction_lock__ when storing
    
    so that it is correctly handled by recoveries.
    Also set the dmaster explicitly.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/dbwrap_ctdb.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index 8563990..8e188d0 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -381,6 +381,8 @@ again:
 	pid = getpid();
 	data.dptr = (unsigned char *)&pid;
 	data.dsize = sizeof(pid_t);
+	crec->header.rsn++;
+	crec->header.dmaster = get_my_vnn();
 	status = db_ctdb_ltdb_store(ctx, key, &(crec->header), data);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0, (__location__ " Failed to store pid in transaction "
@@ -848,7 +850,7 @@ again:
 			}
 		}
 
-		if (++retries == 5) {
+		if (++retries == 100) {
 			DEBUG(0,(__location__ " Giving up transaction on db 0x%08x after %d retries failure_control=%u\n", 
 				 h->ctx->db_id, retries, (unsigned)failure_control));
 			ctdbd_control_local(messaging_ctdbd_connection(), failure_control,


-- 
SAMBA-CTDB repository