[sheepdog] [PATCH 1/3] dog: revert output change of cluster info temporally
Hitoshi Mitake
mitake.hitoshi at lab.ntt.co.jp
Wed Jan 14 06:23:21 CET 2015
This is a temporal solution. After fixing tests which depends on "dog
cluster info", let's revert this one.
Cc: Saeki Masaki <saeki.masaki at po.ntts.co.jp>
Signed-off-by: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
---
dog/cluster.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/dog/cluster.c b/dog/cluster.c
index 6a2db6e..388bf0f 100644
--- a/dog/cluster.c
+++ b/dog/cluster.c
@@ -203,15 +203,14 @@ static void print_nodes(const struct epoch_log *logs, uint16_t flags)
if (entry->disks[nr_disk].disk_id == 0)
break;
}
- printf("%s%s:%d(%d)",
+ printf("%s%s:(%d)",
(i == 0) ? "" : ", ",
addr_to_str(entry->nid.addr, entry->nid.port),
- entry->nr_vnodes, nr_disk);
+ nr_disk);
} else
- printf("%s%s:%d",
+ printf("%s%s",
(i == 0) ? "" : ", ",
- addr_to_str(entry->nid.addr, entry->nid.port),
- entry->nr_vnodes);
+ addr_to_str(entry->nid.addr, entry->nid.port));
}
}
@@ -301,8 +300,7 @@ retry:
if (!raw_output && rsp->data_length > 0) {
ct = logs[0].ctime >> 32;
printf("Cluster created at %s\n", ctime(&ct));
- printf("Epoch Time Version [Host:Port:V-Nodes,,,]");
- printf("\n");
+ printf("Epoch Time Version\n");
}
nr_logs = rsp->data_length / (sizeof(struct epoch_log)
--
1.9.1
More information about the sheepdog
mailing list