[sheepdog] [PATCH v2 04/14] collie: remove master column from node list

MORITA Kazutaka morita.kazutaka at gmail.com
Mon Aug 12 02:11:44 CEST 2013


From: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>

We removed a master node from cluster drivers, so the master column in
the node list is meaningless now.

Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
---
 collie/collie.c          |    2 -
 collie/collie.h          |    1 -
 collie/node.c            |   16 +-----
 include/sheepdog_proto.h |    2 +-
 sheep/group.c            |    1 -
 tests/functional/011.out |   24 ++++----
 tests/functional/012.out |   10 ++--
 tests/functional/036.out |  144 +++++++++++++++++++++++-----------------------
 tests/functional/037.out |  144 +++++++++++++++++++++++-----------------------
 tests/functional/038.out |  144 +++++++++++++++++++++++-----------------------
 tests/functional/042.out |   40 ++++++-------
 tests/functional/048.out |    6 +-
 tests/functional/063.out |   22 +++----
 tests/functional/064.out |   30 +++++-----
 tests/functional/067.out |   20 +++----
 15 files changed, 296 insertions(+), 310 deletions(-)

diff --git a/collie/collie.c b/collie/collie.c
index a60e5c1..ee46039 100644
--- a/collie/collie.c
+++ b/collie/collie.c
@@ -48,7 +48,6 @@ uint32_t sd_epoch;
 struct sd_node sd_nodes[SD_MAX_NODES];
 struct sd_vnode sd_vnodes[SD_MAX_VNODES];
 int sd_nodes_nr, sd_vnodes_nr;
-unsigned master_idx;
 
 int update_node_list(int max_nodes)
 {
@@ -92,7 +91,6 @@ int update_node_list(int max_nodes)
 	memcpy(sd_nodes, buf, size);
 	sd_vnodes_nr = nodes_to_vnodes(sd_nodes, sd_nodes_nr, sd_vnodes);
 	sd_epoch = hdr.epoch;
-	master_idx = rsp->node.master_idx;
 out:
 	if (buf)
 		free(buf);
diff --git a/collie/collie.h b/collie/collie.h
index 6f73ec8..50c1628 100644
--- a/collie/collie.h
+++ b/collie/collie.h
@@ -59,7 +59,6 @@ extern uint32_t sd_epoch;
 extern struct sd_node sd_nodes[SD_MAX_NODES];
 extern struct sd_vnode sd_vnodes[SD_MAX_VNODES];
 extern int sd_nodes_nr, sd_vnodes_nr;
-extern unsigned master_idx;
 
 bool is_current(const struct sd_inode *i);
 char *size_to_str(uint64_t _size, char *str, int str_size);
diff --git a/collie/node.c b/collie/node.c
index 830e629..f011274 100644
--- a/collie/node.c
+++ b/collie/node.c
@@ -31,25 +31,15 @@ static int node_list(int argc, char **argv)
 	int i;
 
 	if (!raw_output)
-		printf("M   Id   Host:Port         V-Nodes       Zone\n");
+		printf("  Id   Host:Port         V-Nodes       Zone\n");
 	for (i = 0; i < sd_nodes_nr; i++) {
 		char data[128];
 
 		addr_to_str(data, sizeof(data), sd_nodes[i].nid.addr,
 			    sd_nodes[i].nid.port);
 
-		if (i == master_idx) {
-			if (highlight)
-				printf(TEXT_BOLD);
-			printf(raw_output ? "* %d %s %d %d\n" : "* %4d   %-20s\t%2d%11d\n",
-			       i, data, sd_nodes[i].nr_vnodes,
-			       sd_nodes[i].zone);
-			if (highlight)
-				printf(TEXT_NORMAL);
-		} else
-			printf(raw_output ? "- %d %s %d %d\n" : "- %4d   %-20s\t%2d%11d\n",
-			       i, data, sd_nodes[i].nr_vnodes,
-			       sd_nodes[i].zone);
+		printf(raw_output ? "%d %s %d %d\n" : "%4d   %-20s\t%2d%11d\n",
+		       i, data, sd_nodes[i].nr_vnodes, sd_nodes[i].zone);
 	}
 
 	return EXIT_SUCCESS;
diff --git a/include/sheepdog_proto.h b/include/sheepdog_proto.h
index 4e302e9..06523ea 100644
--- a/include/sheepdog_proto.h
+++ b/include/sheepdog_proto.h
@@ -180,7 +180,7 @@ struct sd_rsp {
 			uint32_t	__pad;
 			uint32_t	nr_nodes;
 			uint32_t	local_idx;
-			uint32_t	master_idx;
+			uint32_t	__reserved;
 			uint64_t	store_size;
 			uint64_t	store_free;
 		} node;
diff --git a/sheep/group.c b/sheep/group.c
index 9bc8072..6dcafec 100644
--- a/sheep/group.c
+++ b/sheep/group.c
@@ -161,7 +161,6 @@ int local_get_node_list(const struct sd_req *req, struct sd_rsp *rsp,
 		rsp->node.local_idx = 0;
 	}
 
-	rsp->node.master_idx = -1;
 	return SD_RES_SUCCESS;
 }
 
diff --git a/tests/functional/011.out b/tests/functional/011.out
index ce9018c..121b9f1 100644
--- a/tests/functional/011.out
+++ b/tests/functional/011.out
@@ -1,14 +1,14 @@
 QA output created by 011
 check the number of vnodes
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	27          0
--    1   127.0.0.1:7001      	55          1
--    2   127.0.0.1:7002      	110          2
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	27          0
--    1   127.0.0.1:7001      	55          1
--    2   127.0.0.1:7002      	110          2
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	27          0
--    1   127.0.0.1:7001      	55          1
--    2   127.0.0.1:7002      	110          2
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	27          0
+   1   127.0.0.1:7001      	55          1
+   2   127.0.0.1:7002      	110          2
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	27          0
+   1   127.0.0.1:7001      	55          1
+   2   127.0.0.1:7002      	110          2
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	27          0
+   1   127.0.0.1:7001      	55          1
+   2   127.0.0.1:7002      	110          2
diff --git a/tests/functional/012.out b/tests/functional/012.out
index 377904b..dfba0be 100644
--- a/tests/functional/012.out
+++ b/tests/functional/012.out
@@ -1,7 +1,7 @@
 QA output created by 012
 check the number of vnodes
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7004      	 0          4
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7004      	 0          4
diff --git a/tests/functional/036.out b/tests/functional/036.out
index 29bd9f2..3fb4378 100644
--- a/tests/functional/036.out
+++ b/tests/functional/036.out
@@ -1,82 +1,82 @@
 QA output created by 036
 using backend plain store
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
diff --git a/tests/functional/037.out b/tests/functional/037.out
index 0f1fd40..33c368c 100644
--- a/tests/functional/037.out
+++ b/tests/functional/037.out
@@ -1,82 +1,82 @@
 QA output created by 037
 using backend plain store
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
diff --git a/tests/functional/038.out b/tests/functional/038.out
index a6f534e..80e7532 100644
--- a/tests/functional/038.out
+++ b/tests/functional/038.out
@@ -1,82 +1,82 @@
 QA output created by 038
 using backend plain store
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
 Cluster status: running, auto-recovery enabled
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	64          3
--    4   127.0.0.1:7004      	64          4
--    5   127.0.0.1:7005      	64          5
--    6   127.0.0.1:7006      	64          6
--    7   127.0.0.1:7007      	64          7
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	64          3
+   4   127.0.0.1:7004      	64          4
+   5   127.0.0.1:7005      	64          5
+   6   127.0.0.1:7006      	64          6
+   7   127.0.0.1:7007      	64          7
diff --git a/tests/functional/042.out b/tests/functional/042.out
index 2449d2f..2876a00 100644
--- a/tests/functional/042.out
+++ b/tests/functional/042.out
@@ -46,26 +46,26 @@ Failed to write object fd32fc0000000a: Server has no space for new objects
 Failed to write VDI
 Failed to create VDI test2: Failed to write to requested VDI
 Failed to create VDI test3: Failed to write to requested VDI
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	126          0
--    1   127.0.0.1:7001      	126          1
--    2   127.0.0.1:7002      	 2          2
--    3   127.0.0.1:7003      	 2          3
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	126          0
--    1   127.0.0.1:7001      	126          1
--    2   127.0.0.1:7002      	 2          2
--    3   127.0.0.1:7003      	 2          3
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	126          0
--    1   127.0.0.1:7001      	126          1
--    2   127.0.0.1:7002      	 2          2
--    3   127.0.0.1:7003      	 2          3
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	126          0
--    1   127.0.0.1:7001      	126          1
--    2   127.0.0.1:7002      	 2          2
--    3   127.0.0.1:7003      	 2          3
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	126          0
+   1   127.0.0.1:7001      	126          1
+   2   127.0.0.1:7002      	 2          2
+   3   127.0.0.1:7003      	 2          3
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	126          0
+   1   127.0.0.1:7001      	126          1
+   2   127.0.0.1:7002      	 2          2
+   3   127.0.0.1:7003      	 2          3
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	126          0
+   1   127.0.0.1:7001      	126          1
+   2   127.0.0.1:7002      	 2          2
+   3   127.0.0.1:7003      	 2          3
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	126          0
+   1   127.0.0.1:7001      	126          1
+   2   127.0.0.1:7002      	 2          2
+   3   127.0.0.1:7003      	 2          3
 STORE	DATA	VDI	VMSTATE	ATTR	STALE
 0	22	4	0	0	0
 1	22	4	0	0	0
diff --git a/tests/functional/048.out b/tests/functional/048.out
index 2ed1426..552c79a 100644
--- a/tests/functional/048.out
+++ b/tests/functional/048.out
@@ -1,8 +1,8 @@
 QA output created by 048
 using backend plain store
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7001      	64          1
--    1   127.0.0.1:7002      	64          2
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7001      	64          1
+   1   127.0.0.1:7002      	64          2
 Tracking the inode object 0x7c2b25 with 5 nodes
 
 obj 807c2b2500000000 locations at epoch 1, copies = 3
diff --git a/tests/functional/063.out b/tests/functional/063.out
index 194d523..d85a80e 100644
--- a/tests/functional/063.out
+++ b/tests/functional/063.out
@@ -7,11 +7,11 @@ STORE	DATA	VDI	VMSTATE	ATTR	STALE
 3	0	0	0	0	0
 4	0	0	0	0	0
 5	0	0	0	0	0
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
--    3   127.0.0.1:7003      	 0          3
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
+   3   127.0.0.1:7003      	 0          3
 STORE	DATA	VDI	VMSTATE	ATTR	STALE
 0	9	0	0	0	0
 1	13	1	0	0	0
@@ -19,12 +19,12 @@ STORE	DATA	VDI	VMSTATE	ATTR	STALE
 3	0	0	0	0	0
 4	8	0	0	0	0
 5	11	0	0	0	0
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	102          0
--    1   127.0.0.1:7001      	51          1
--    2   127.0.0.1:7002      	51          2
--    3   127.0.0.1:7003      	 0          3
--    4   127.0.0.1:7005      	51          5
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	102          0
+   1   127.0.0.1:7001      	51          1
+   2   127.0.0.1:7002      	51          2
+   3   127.0.0.1:7003      	 0          3
+   4   127.0.0.1:7005      	51          5
 Cluster status: running, auto-recovery enabled
 
 Cluster created at DATE
diff --git a/tests/functional/064.out b/tests/functional/064.out
index 25b2f65..df49e41 100644
--- a/tests/functional/064.out
+++ b/tests/functional/064.out
@@ -5,35 +5,35 @@ STORE	DATA	VDI	VMSTATE	ATTR	STALE
 1	12	1	0	0	0
 2	21	0	0	0	0
 3	0	0	0	0	0
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	48          0
--    1   127.0.0.1:7001      	48          1
--    2   127.0.0.1:7002      	96          2
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	48          0
+   1   127.0.0.1:7001      	48          1
+   2   127.0.0.1:7002      	96          2
 STORE	DATA	VDI	VMSTATE	ATTR	STALE
 0	8	1	0	0	0
 1	12	1	0	0	0
 2	21	0	0	0	0
 3	9	0	0	0	0
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	48          0
--    1   127.0.0.1:7001      	48          1
--    2   127.0.0.1:7002      	96          2
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	48          0
+   1   127.0.0.1:7001      	48          1
+   2   127.0.0.1:7002      	96          2
 STORE	DATA	VDI	VMSTATE	ATTR	STALE
 0	11	1	0	0	0
 1	25	1	0	0	0
 3	14	0	0	0	0
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	85          0
--    1   127.0.0.1:7001      	43          1
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	85          0
+   1   127.0.0.1:7001      	43          1
 STORE	DATA	VDI	VMSTATE	ATTR	STALE
 0	9	1	0	0	0
 1	10	1	0	0	0
 2	19	0	0	0	0
 3	12	0	0	0	0
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	77          0
--    1   127.0.0.1:7001      	38          1
--    2   127.0.0.1:7002      	77          2
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	77          0
+   1   127.0.0.1:7001      	38          1
+   2   127.0.0.1:7002      	77          2
 Cluster status: running, auto-recovery enabled
 
 Cluster created at DATE
diff --git a/tests/functional/067.out b/tests/functional/067.out
index 2c3f730..43d2eeb 100644
--- a/tests/functional/067.out
+++ b/tests/functional/067.out
@@ -1,13 +1,13 @@
 QA output created by 067
 using backend plain store
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7000      	64          0
--    1   127.0.0.1:7001      	64          1
--    2   127.0.0.1:7002      	64          2
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7000      	64          0
+   1   127.0.0.1:7001      	64          1
+   2   127.0.0.1:7002      	64          2
 check whether all nodes have the same cluster info
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7001      	64          1
--    1   127.0.0.1:7002      	64          2
-M   Id   Host:Port         V-Nodes       Zone
--    0   127.0.0.1:7001      	64          1
--    1   127.0.0.1:7002      	64          2
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7001      	64          1
+   1   127.0.0.1:7002      	64          2
+  Id   Host:Port         V-Nodes       Zone
+   0   127.0.0.1:7001      	64          1
+   1   127.0.0.1:7002      	64          2
-- 
1.7.9.5




More information about the sheepdog mailing list