ctdb-tools: Drop testing hook from ctdb tool
authorMartin Schwenke <martin@meltin.net>
Wed, 14 Mar 2018 04:25:34 +0000 (15:25 +1100)
committerAmitay Isaacs <amitay@samba.org>
Mon, 19 Mar 2018 01:23:20 +0000 (02:23 +0100)
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/tools/ctdb.c

index c3b2dcb23dd32189f4985e19ca47277fce5a411d..6110cc12dbe2189d7e159c53d7f3af3d8d856314 100644 (file)
@@ -477,18 +477,9 @@ static struct ctdb_node_map *ctdb_read_nodes_file(TALLOC_CTX *mem_ctx,
 static struct ctdb_node_map *read_nodes_file(TALLOC_CTX *mem_ctx, uint32_t pnn)
 {
        struct ctdb_node_map *nodemap;
-       char *nodepath;
        const char *nodes_list = NULL;
 
-       if (pnn != CTDB_UNKNOWN_PNN) {
-               nodepath = talloc_asprintf(mem_ctx, "CTDB_NODES_%u", pnn);
-               if (nodepath != NULL) {
-                       nodes_list = getenv(nodepath);
-               }
-       }
-       if (nodes_list == NULL) {
-               nodes_list = getenv("CTDB_NODES");
-       }
+       nodes_list = getenv("CTDB_NODES");
        if (nodes_list == NULL) {
                const char *basedir = getenv("CTDB_BASE");
                if (basedir == NULL) {