[SCM] CTDB repository - branch 1.0.112 updated - ctdb-1.0.111-130-gebed50d

Ronnie Sahlberg sahlberg at samba.org
Wed Aug 4 23:43:34 MDT 2010


The branch, 1.0.112 has been updated
       via  ebed50dc9c231ab43552c52ee9ea928fa4eec068 (commit)
       via  e95940ec0de81ac3a3bce78fadbdfeef31680761 (commit)
      from  46b093324c01c56a12fdde0b47980ee57c33c00e (commit)

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


- Log -----------------------------------------------------------------
commit ebed50dc9c231ab43552c52ee9ea928fa4eec068
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Aug 5 15:41:35 2010 +1000

    Revert "For deterministic IPs, check if the designated node can host the ip before"
    
    This reverts commit 5e60aad0e19cabb29c3be191698e10049da151c7.
    
    This change lowers the "flapping" but at the expense of less balance.
    Keeping the system balancved is likely better than minimizing the amount of flapping
    for this configuration

commit e95940ec0de81ac3a3bce78fadbdfeef31680761
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Thu Aug 5 08:01:55 2010 +0930

    vacuum: close fd leak
    
    Commit 517f05e42f17766b1e8db8f1f4789cbad968e304 "freeze: abort vacuuming
    when we're going to freeze." introduced a file descriptor leak, because
    the abortfd used to talk to the child wasn't closed.
    
    Do this in the destructor.
    
    CQ:S1019190
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

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

Summary of changes:
 server/ctdb_takeover.c |    9 ++-------
 server/ctdb_vacuum.c   |    1 +
 2 files changed, 3 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index d0de683..cb65f29 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -737,7 +737,7 @@ create_merged_ip_list(struct ctdb_context *ctdb)
  */
 int ctdb_takeover_run(struct ctdb_context *ctdb, struct ctdb_node_map *nodemap)
 {
-	int i, num_healthy, retries, num_ips;
+  int i, num_healthy, retries, num_ips;
 	struct ctdb_public_ip ip;
 	struct ctdb_public_ipv4 ipv4;
 	uint32_t mask;
@@ -795,12 +795,7 @@ int ctdb_takeover_run(struct ctdb_context *ctdb, struct ctdb_node_map *nodemap)
 	if (1 == ctdb->tunable.deterministic_public_ips) {		
 		DEBUG(DEBUG_NOTICE,("Deterministic IPs enabled. Resetting all ip allocations\n"));
 		for (i=0,tmp_ip=all_ips;tmp_ip;tmp_ip=tmp_ip->next,i++) {
-			int tmp_pnn;
-
-			tmp_pnn = i%nodemap->num;
-			if (can_node_serve_ip(ctdb, tmp_pnn, tmp_ip) == 0) {
-				tmp_ip->pnn = tmp_pnn;
-			}
+			tmp_ip->pnn = i%nodemap->num;
 		}
 	}
 
diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c
index 91ea74f..59713e6 100644
--- a/server/ctdb_vacuum.c
+++ b/server/ctdb_vacuum.c
@@ -771,6 +771,7 @@ static int vacuum_child_destructor(struct ctdb_vacuum_child_context *child_ctx)
 	}
 
 	DLIST_REMOVE(ctdb->vacuumers, child_ctx);
+	close(child_ctx->abortfd[1]);
 
 	event_add_timed(ctdb->ev, child_ctx->vacuum_handle,
 			timeval_current_ofs(get_vacuum_interval(ctdb_db), 0), 


-- 
CTDB repository


More information about the samba-cvs mailing list