From: Martin Schwenke <martin@meltin.net>
Date: Wed, 22 Jun 2016 01:02:36 +0000 (+1000)
Subject: ctdb-tests: Drop CTDB_TEST_MAX_NODES
X-Git-Tag: tdb-1.3.10~555
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27a26087e11c1154a750d2f8c2e3b46b8304a8d6;p=thirdparty%2Fsamba.git

ctdb-tests: Drop CTDB_TEST_MAX_NODES

The node map is dynamically constructed.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tests/src/ctdb_takeover_tests.c b/ctdb/tests/src/ctdb_takeover_tests.c
index 583dac9c382..a46ddbcba6c 100644
--- a/ctdb/tests/src/ctdb_takeover_tests.c
+++ b/ctdb/tests/src/ctdb_takeover_tests.c
@@ -21,9 +21,6 @@
 
 #include "ctdbd_test.c"
 
-/* This is lazy... but it is test code! */
-#define CTDB_TEST_MAX_NODES 256
-
 static void print_ctdb_public_ip_list(struct public_ip_list * ips)
 {
 	while (ips) {
@@ -129,10 +126,10 @@ static void read_ctdb_public_ip_info(TALLOC_CTX *ctx,
 	enum ctdb_runstate *runstate;
 
 	*known = talloc_zero_array(ctx, struct ctdb_public_ip_list,
-				   CTDB_TEST_MAX_NODES);
+				   numnodes);
 	assert(*known != NULL);
 	*avail = talloc_zero_array(ctx, struct ctdb_public_ip_list,
-				   CTDB_TEST_MAX_NODES);
+				   numnodes);
 	assert(*avail != NULL);
 
 	if (multi) {
@@ -266,10 +263,6 @@ static void ctdb_test_init(const char nodestates[],
 		nodemap->nodes[n].flags = (uint32_t) strtol(tok, NULL, 0);
 		nodemap->nodes[n].addr = sa_zero;
 		nodemap->num++;
-		if (nodemap->num >= CTDB_TEST_MAX_NODES) {
-			DEBUG(DEBUG_ERR, ("ERROR: Exceeding CTDB_TEST_MAX_NODES: %d\n", CTDB_TEST_MAX_NODES));
-			exit(1);
-		}
 		tok = strtok(NULL, ",");
 	}