[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  21d3aa8... packaging(RHEL-CTDB): package dbwrap_tool and dbwrap_torture in the common pkg
       via  04ba95c... s3:dbwrap_ctdb: increase the number of commit retries 5-->100
       via  d92d770... s3:dbwrap_ctdb: increase the rsn of the __transaction_lock__ when storing
      from  743155f... s3: Fix explicit stat64 support

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 21d3aa814577690dac0e301bc2863c0f464f0e2e
Author: Michael Adam <obnox at samba.org>
Date:   Fri Dec 4 23:29:22 2009 +0100

    packaging(RHEL-CTDB): package dbwrap_tool and dbwrap_torture in the common pkg
    
    Michael

commit 04ba95c09d6d99f42f472435f6b21798f0bba418
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 d92d770d238bf982627ae9e7498650ba77674057
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:
 packaging/RHEL-CTDB/samba.spec.tmpl |    5 +++++
 source3/lib/dbwrap_ctdb.c           |    4 +++-
 2 files changed, 8 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index 9ee39cf..5b05b99 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -302,6 +302,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_libarchdir}/krb5/plugins/libkrb5
 cd source3
 make DESTDIR=$RPM_BUILD_ROOT \
         install
+
+make DESTDIR=$RPM_BUILD_ROOT \
+        install-dbwrap_tool install-dbwrap_torture
 cd ..
 
 # NSS winbind support
@@ -590,6 +593,8 @@ exit 0
 %{_bindir}/ntlm_auth
 %{_bindir}/pdbedit
 %{_bindir}/smbcquotas
+%{_bindir}/dbwrap_tool
+%{_bindir}/dbwrap_torture
 
 %{_mandir}/man1/ntlm_auth.1*
 %{_mandir}/man1/profiles.1*
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 Shared Repository