[SCM] CTDB repository - branch 1.2-nodeflags updated - ctdb-1.9.1-288-ge8c0c0b

[Ronnie Sahlberg]

The branch, 1.2-nodeflags has been updated
       via  e8c0c0bda4f8db848cae1085eacb261703540a3f (commit)
       via  550dd59a9239d9aa39f96cf391f7f5435845d51e (commit)
      from  1c65d5f669284f308ba0f64f14395552440e0bd9 (commit)

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


- Log -----------------------------------------------------------------
commit e8c0c0bda4f8db848cae1085eacb261703540a3f
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Feb 2 15:00:53 2011 +1100

    We default to non-deterministic ip now where ips are "sticky" and dont change
    too much.
    This means we can simplify the way we add ips significantly and stop
    trying to move them.
    
    We also check if the node already hosts the ip, in which case we used to return an error. Instead just print an error string but return 0, ok.
    This makes it easier to script, and works around broken scripts.
    
    CQ1021034

commit 550dd59a9239d9aa39f96cf391f7f5435845d51e
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Jan 31 17:40:26 2011 +1100

    If the node is stopped,   put a log entry in /var/log/* to indicate this is why we never become ready

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

Summary of changes:
 server/ctdb_monitor.c |    3 +++
 tools/ctdb.c          |   45 ++++++++++++++-------------------------------
 2 files changed, 17 insertions(+), 31 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_monitor.c b/server/ctdb_monitor.c
index 3d3531b..31149aa 100644
--- a/server/ctdb_monitor.c
+++ b/server/ctdb_monitor.c
@@ -205,6 +205,9 @@ static void ctdb_wait_until_recovered(struct event_context *ev, struct timed_eve
 	int ret;
 
 	DEBUG(DEBUG_NOTICE,("CTDB_WAIT_UNTIL_RECOVERED\n"));
+	if (ctdb->nodes[ctdb->pnn]->flags & NODE_FLAGS_STOPPED) {
+		DEBUG(DEBUG_NOTICE,("Node is STOPPED. Node will NOT recover.\n"));
+	}
 
 	if (ctdb->vnn_map->generation == INVALID_GENERATION) {
 		ctdb->db_persistent_startup_generation = INVALID_GENERATION;
diff --git a/tools/ctdb.c b/tools/ctdb.c
index 8a423dd..cfd7ff2 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -1626,7 +1626,6 @@ static int control_addip(struct ctdb_context *ctdb, int argc, const char **argv)
 {
 	int i, ret;
 	int len, retries = 0;
-	uint32_t pnn;
 	unsigned mask;
 	ctdb_sock_addr addr;
 	struct ctdb_control_ip_iface *pub;
@@ -1645,23 +1644,28 @@ static int control_addip(struct ctdb_context *ctdb, int argc, const char **argv)
 		return -1;
 	}
 
-	ret = control_get_all_public_ips(ctdb, tmp_ctx, &ips);
+	/* read the public ip list from the node */
+	ret = ctdb_ctrl_get_public_ips(ctdb, TIMELIMIT(), options.pnn, tmp_ctx, &ips);
 	if (ret != 0) {
-		DEBUG(DEBUG_ERR, ("Unable to get public ip list from cluster\n"));
+		DEBUG(DEBUG_ERR, ("Unable to get public ip list from node %u\n", options.pnn));
 		talloc_free(tmp_ctx);
-		return ret;
+		return -1;
 	}
-
-
-	/* check if some other node is already serving this ip, if not,
-	 * we will claim it
-	 */
 	for (i=0;i<ips->num;i++) {
 		if (ctdb_same_ip(&addr, &ips->ips[i].addr)) {
-			break;
+			DEBUG(DEBUG_ERR,("Can not add ip to node. Node already hosts this ip\n"));
+			return 0;
 		}
 	}
 
+
+
+	/* Dont timeout. This command waits for an ip reallocation
+	   which sometimes can take wuite a while if there has
+	   been a recent recovery
+	*/
+	alarm(0);
+
 	len = offsetof(struct ctdb_control_ip_iface, iface) + strlen(argv[1]) + 1;
 	pub = talloc_size(tmp_ctx, len); 
 	CTDB_NO_MEMORY(ctdb, pub);
@@ -1685,27 +1689,6 @@ static int control_addip(struct ctdb_context *ctdb, int argc, const char **argv)
 		return ret;
 	}
 
-	if (i == ips->num) {
-		/* no one has this ip so we claim it */
-		pnn  = options.pnn;
-	} else {
-		pnn  = ips->ips[i].pnn;
-	}
-
-	do {
-		ret = move_ip(ctdb, &addr, pnn);
-		if (ret != 0) {
-			DEBUG(DEBUG_ERR,("Failed to move ip to node %d. wait 3 seconds and try again.\n", pnn));
-			sleep(3);
-			retries++;
-		}
-	} while (retries < 5 && ret != 0);
-	if (ret != 0) {
-		DEBUG(DEBUG_ERR,("Failed to move ip to node %d. Giving up.\n", pnn));
-		talloc_free(tmp_ctx);
-		return ret;
-	}
-
 	do {
 		ret = control_ipreallocate(ctdb, argc, argv);
 		if (ret != 0) {


-- 
CTDB repository