[SCM] CTDB repository - branch 1.2.40 updated - ctdb-1.2.58-3-g158a1e8

[Amitay Isaacs]

The branch, 1.2.40 has been updated
       via  158a1e8d045c4b65dd3f52eb70535e446ec4fb48 (commit)
       via  9db4a482ac8910a3dd1d4109d156420ced3551b3 (commit)
       via  c668d5d2d3111bd0e89159c432d191e09661435f (commit)
      from  44558223c2f83cafbe4ee63b4ce3d508dc7f0a02 (commit)

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


- Log -----------------------------------------------------------------
commit 158a1e8d045c4b65dd3f52eb70535e446ec4fb48
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Fri Feb 22 12:28:56 2013 +1100

    ctdbd: Remove the variable declaration shadowing earlier declaration
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>

commit 9db4a482ac8910a3dd1d4109d156420ced3551b3
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Fri Feb 22 12:28:25 2013 +1100

    ctdbd: Use the correct local variable to check status
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>

commit c668d5d2d3111bd0e89159c432d191e09661435f
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Feb 20 10:46:47 2013 +0100

    ctdbd: Fix a struct initializer

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

Summary of changes:
 server/ctdb_ltdb_server.c |    2 +-
 server/ctdb_persistent.c  |    8 ++++----
 server/ctdb_tunables.c    |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_ltdb_server.c b/server/ctdb_ltdb_server.c
index dc93c3f..c9cf021 100644
--- a/server/ctdb_ltdb_server.c
+++ b/server/ctdb_ltdb_server.c
@@ -257,7 +257,7 @@ store:
 	if (schedule_for_deletion) {
 		int ret2;
 		ret2 = ctdb_local_schedule_for_deletion(ctdb_db, header, key);
-		if (ret != 0) {
+		if (ret2 != 0) {
 			DEBUG(DEBUG_ERR, (__location__ " ctdb_local_schedule_for_deletion failed.\n"));
 		}
 	}
diff --git a/server/ctdb_persistent.c b/server/ctdb_persistent.c
index 5a31101..eb7f65d 100644
--- a/server/ctdb_persistent.c
+++ b/server/ctdb_persistent.c
@@ -477,13 +477,13 @@ static int ctdb_persistent_store(struct ctdb_persistent_write_state *state)
 		   ctdb_ltdb_fetch will unconditionally create a record
 		 */
 		if (state->flags & UPDATE_FLAGS_REPLACE_ONLY) {
-			TDB_DATA rec;
-			rec = tdb_fetch(state->ctdb_db->ltdb->tdb, key);
-			if (rec.dsize == 0) {
+			TDB_DATA rec2;
+			rec2 = tdb_fetch(state->ctdb_db->ltdb->tdb, key);
+			if (rec2.dsize == 0) {
 				talloc_free(tmp_ctx);
 				continue;
 			}
-			free(rec.dptr);
+			free(rec2.dptr);
 		}
 
 		/* fetch the old header and ensure the rsn is less than the new rsn */
diff --git a/server/ctdb_tunables.c b/server/ctdb_tunables.c
index 4c7146e..a8e8e23 100644
--- a/server/ctdb_tunables.c
+++ b/server/ctdb_tunables.c
@@ -73,7 +73,7 @@ static const struct {
 	{ "DeferredRebalanceOnNodeAdd", 300, offsetof(struct ctdb_tunable, deferred_rebalance_on_node_add) },
 	{ "RecoverPDBBySeqNum",  1, offsetof(struct ctdb_tunable, recover_pdb_by_seqnum) },
 	{ "FetchCollapse",       1, offsetof(struct ctdb_tunable, fetch_collapse) },
-	{ "PullDBPreallocation", 10*1024*1024,  offsetof(struct ctdb_tunable, pulldb_preallocation_size), false },
+	{ "PullDBPreallocation", 10*1024*1024,  offsetof(struct ctdb_tunable, pulldb_preallocation_size) },
 };
 
 /*


-- 
CTDB repository