[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 9442e256ce46ab4c80883a7a2fb793d4ea1f7010

[Michael Adam]

The branch, v3-4-ctdb has been updated
       via  9442e256ce46ab4c80883a7a2fb793d4ea1f7010 (commit)
       via  37362895503a11433ee7005a95db1e5d77192361 (commit)
      from  15ab290f79f516bde3dde6ef9a9cfd55a3bc3a37 (commit)

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


- Log -----------------------------------------------------------------
commit 9442e256ce46ab4c80883a7a2fb793d4ea1f7010
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Oct 22 13:04:04 2009 +0200

    v3-4-ctdb: Bump the ctdb verdor patch level to 9.

commit 37362895503a11433ee7005a95db1e5d77192361
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Oct 22 13:03:20 2009 +0200

    cluster_fatal() exit code should not indicate success.
    
    cluster_fatal() logs a fatal event and then exits with 0.  This seems
    wrong.  Sometimes command like "net" use this code and return
    incorrect empty output but then exit with 0.
    
    This simply changes the exit code to 1.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

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

Summary of changes:
 source3/VERSION           |    2 +-
 source3/lib/ctdbd_conn.c  |    2 +-
 source3/lib/dbwrap_ctdb.c |    6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/VERSION b/source3/VERSION
index 2945107..96f9b2e 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -85,7 +85,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=no
 #                                                      #
 ########################################################
 SAMBA_VERSION_VENDOR_SUFFIX="ctdb"
-SAMBA_VERSION_VENDOR_PATCH=8
+SAMBA_VERSION_VENDOR_PATCH=9
 
 ########################################################
 # This can be set by vendors if they want..            #
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index dde3775..d34d23e 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -57,7 +57,7 @@ static void cluster_fatal(const char *why)
 	   a core file. We need to release this process id immediately
 	   so that someone else can take over without getting sharing
 	   violations */
-	_exit(0);
+	_exit(1);
 }
 
 /*
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index f492d5f..8337877 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -23,6 +23,10 @@
 #include "ctdb_private.h"
 #include "ctdbd_conn.h"
 
+struct db_ctdb_transaction_record {
+	TDB_DATA key, data;
+};
+
 struct db_ctdb_transaction_handle {
 	struct db_ctdb_ctx *ctx;
 	bool in_replay;
@@ -33,6 +37,8 @@ struct db_ctdb_transaction_handle {
 	struct ctdb_marshall_buffer *m_write;
 	uint32_t nesting;
 	bool nested_cancel;
+
+	struct db_ctdb_transaction_record *transaction_records;
 };
 
 struct db_ctdb_ctx {


-- 
SAMBA-CTDB repository