nr_copies is removed because it isn't used at all Signed-off-by: Liu Yuan <namei.unix at gmail.com> --- collie/cluster.c | 3 ++- include/internal_proto.h | 3 ++- sheep/ops.c | 2 +- tests/001.out | 8 ++++---- tests/002.out | 8 ++++---- tests/003.out | 8 ++++---- tests/004.out | 12 ++++++------ tests/005.out | 14 +++++++------- tests/010.out | 12 ++++++------ tests/025.out | 8 ++++---- tests/036.out | 16 ++++++++-------- tests/037.out | 16 ++++++++-------- tests/038.out | 16 ++++++++-------- tests/043.out | 28 ++++++++++++++-------------- tests/051.out | 2 +- tests/052.out | 20 ++++++++++---------- tests/053.out | 36 ++++++++++++++++++------------------ tests/054.out | 4 ++-- tests/055.out | 8 ++++---- tests/056.out | 4 ++-- tests/057.out | 6 +++--- 21 files changed, 118 insertions(+), 116 deletions(-) diff --git a/collie/cluster.c b/collie/cluster.c index dc7ff5a..3ae901b 100644 --- a/collie/cluster.c +++ b/collie/cluster.c @@ -155,7 +155,8 @@ static int cluster_info(int argc, char **argv) if (!raw_output) printf("Cluster status: "); if (rsp->result == SD_RES_SUCCESS) - printf("running\n"); + printf("running, auto-recovery %s\n", logs->disable_recovery ? + "disabled" : "enabled"); else printf("%s\n", sd_strerror(rsp->result)); diff --git a/include/internal_proto.h b/include/internal_proto.h index a04af88..2057f9b 100644 --- a/include/internal_proto.h +++ b/include/internal_proto.h @@ -130,7 +130,8 @@ struct epoch_log { uint64_t time; /* treated as time_t */ uint32_t epoch; uint32_t nr_nodes; - uint32_t nr_copies; + uint8_t disable_recovery; + uint8_t __pad[3]; struct sd_node nodes[SD_MAX_NODES]; }; diff --git a/sheep/ops.c b/sheep/ops.c index 6e1caa7..9399fd8 100644 --- a/sheep/ops.c +++ b/sheep/ops.c @@ -452,7 +452,7 @@ static int local_stat_cluster(struct request *req) (time_t *)&log->time, req->vinfo); - log->nr_copies = sys->nr_copies; + log->disable_recovery = sys->disable_recovery; rsp->data_length += sizeof(*log); epoch--; diff --git a/tests/001.out b/tests/001.out index f548cf2..a430608 100644 --- a/tests/001.out +++ b/tests/001.out @@ -1,7 +1,7 @@ QA output created by 001 using backend farm store check whether Sheepdog is running with only one node -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -11,7 +11,7 @@ DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] DATE 2 [] DATE 1 [] check whether all nodes have the same cluster info -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -22,7 +22,7 @@ DATE 4 [127.0.0.1:7002] DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] DATE 2 [127.0.0.1:7001] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -33,7 +33,7 @@ DATE 4 [127.0.0.1:7002] DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] DATE 2 [127.0.0.1:7001] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE diff --git a/tests/002.out b/tests/002.out index 75a2756..808c1ed 100644 --- a/tests/002.out +++ b/tests/002.out @@ -1,7 +1,7 @@ QA output created by 002 using backend farm store check whether Sheepdog is running with only one node -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -10,7 +10,7 @@ DATE 3 [127.0.0.1:7002] DATE 2 [127.0.0.1:7001, 127.0.0.1:7002] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] check whether all nodes have the same cluster info -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -20,7 +20,7 @@ DATE 4 [127.0.0.1:7000, 127.0.0.1:7002] DATE 3 [127.0.0.1:7002] DATE 2 [127.0.0.1:7001, 127.0.0.1:7002] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -30,7 +30,7 @@ DATE 4 [127.0.0.1:7000, 127.0.0.1:7002] DATE 3 [127.0.0.1:7002] DATE 2 [127.0.0.1:7001, 127.0.0.1:7002] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE diff --git a/tests/003.out b/tests/003.out index 1c2b9c8..d62b4bd 100644 --- a/tests/003.out +++ b/tests/003.out @@ -1,7 +1,7 @@ QA output created by 003 using backend farm store check whether Sheepdog is running with only one node -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -10,7 +10,7 @@ DATE 3 [127.0.0.1:7002] DATE 2 [127.0.0.1:7001, 127.0.0.1:7002] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] check whether all nodes have the same cluster info -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -20,7 +20,7 @@ DATE 4 [127.0.0.1:7000, 127.0.0.1:7002] DATE 3 [127.0.0.1:7002] DATE 2 [127.0.0.1:7001, 127.0.0.1:7002] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -30,7 +30,7 @@ DATE 4 [127.0.0.1:7000, 127.0.0.1:7002] DATE 3 [127.0.0.1:7002] DATE 2 [127.0.0.1:7001, 127.0.0.1:7002] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE diff --git a/tests/004.out b/tests/004.out index a2cc2e0..ae6350b 100644 --- a/tests/004.out +++ b/tests/004.out @@ -1,7 +1,7 @@ QA output created by 004 using backend farm store check whether Sheepdog is running with only one node -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -15,7 +15,7 @@ DATE 3 [] DATE 2 [] DATE 1 [] check whether all nodes have the same cluster info -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -32,7 +32,7 @@ DATE 4 [127.0.0.1:7002] DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] DATE 2 [127.0.0.1:7001] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -49,7 +49,7 @@ DATE 4 [127.0.0.1:7002] DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] DATE 2 [127.0.0.1:7001] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -66,7 +66,7 @@ DATE 4 [127.0.0.1:7002] DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] DATE 2 [127.0.0.1:7001] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -83,7 +83,7 @@ DATE 4 [127.0.0.1:7002] DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] DATE 2 [127.0.0.1:7001] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE diff --git a/tests/005.out b/tests/005.out index 1cc8369..fceadd1 100644 --- a/tests/005.out +++ b/tests/005.out @@ -1,7 +1,7 @@ QA output created by 005 using backend farm store check whether Sheepdog is working with two nodes -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -13,7 +13,7 @@ DATE 4 [] DATE 3 [] DATE 2 [] DATE 1 [] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -26,7 +26,7 @@ DATE 3 [] DATE 2 [] DATE 1 [] check whether all nodes have the same cluster info -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -41,7 +41,7 @@ DATE 4 [127.0.0.1:7002] DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] DATE 2 [127.0.0.1:7001] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -56,7 +56,7 @@ DATE 4 [127.0.0.1:7002] DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] DATE 2 [127.0.0.1:7001] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -71,7 +71,7 @@ DATE 4 [127.0.0.1:7002] DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] DATE 2 [127.0.0.1:7001] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -86,7 +86,7 @@ DATE 4 [127.0.0.1:7002] DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] DATE 2 [127.0.0.1:7001] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE diff --git a/tests/010.out b/tests/010.out index 293da8a..8d9fe49 100644 --- a/tests/010.out +++ b/tests/010.out @@ -28,7 +28,7 @@ STORE/4/obj/007c2b2500000003 STORE/4/obj/007c2b2500000004 STORE/4/obj/007c2b2500000005 STORE/4/obj/007c2b2500000006 -Cluster status: running +Cluster status: running, auto-recovery disabled Cluster created at DATE @@ -65,7 +65,7 @@ a8775e30ddc5eda14d76e5361a514392 - 8124234db4755d4772c3440f2cbd1ecb - 62630992718e77c73873ce1672d80786 - 19b9d4d75a5a71bfad364628880fa913 - -Cluster status: running +Cluster status: running, auto-recovery disabled Cluster created at DATE @@ -106,7 +106,7 @@ STORE/4/obj/007c2b2500000004 STORE/4/obj/007c2b2500000005 STORE/4/obj/007c2b2500000006 Cluster recovery: enable -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -150,7 +150,7 @@ STORE/4/obj/007c2b2500000004 STORE/4/obj/007c2b2500000005 STORE/4/obj/007c2b2500000006 Cluster recovery: disable -Cluster status: running +Cluster status: running, auto-recovery disabled Cluster created at DATE @@ -173,7 +173,7 @@ e0b27e7466a3c21d0a4dedfed8bb9184 - f35835c0a25be5ee75a536d1816c1db4 - 0faf5f38c28a38a6db1e6dfcdf259141 - 83bffbfb00dbcb7d6b4a2fa9274175b9 - -Cluster status: running +Cluster status: running, auto-recovery disabled Cluster created at DATE @@ -197,7 +197,7 @@ STORE/4/obj/007c2b2500000002 STORE/6/obj/007c2b2500000003 STORE/7/obj/007c2b2500000003 Cluster recovery: enable -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE diff --git a/tests/025.out b/tests/025.out index 3921e72..f85d236 100644 --- a/tests/025.out +++ b/tests/025.out @@ -12,28 +12,28 @@ read 1048576/1048576 bytes at offset 0 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) starting a sheep in the third zone check that all sheep are alive -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE diff --git a/tests/036.out b/tests/036.out index f0a32a2..357939a 100644 --- a/tests/036.out +++ b/tests/036.out @@ -1,6 +1,6 @@ QA output created by 036 using backend farm store -Cluster status: running +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 @@ -10,7 +10,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -20,7 +20,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -30,7 +30,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -40,7 +40,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -50,7 +50,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -60,7 +60,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -70,7 +70,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 diff --git a/tests/037.out b/tests/037.out index a2e6ff9..830e528 100644 --- a/tests/037.out +++ b/tests/037.out @@ -1,6 +1,6 @@ QA output created by 037 using backend farm store -Cluster status: running +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 @@ -10,7 +10,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -20,7 +20,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -30,7 +30,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -40,7 +40,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -50,7 +50,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -60,7 +60,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -70,7 +70,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 diff --git a/tests/038.out b/tests/038.out index 284a909..6cbef85 100644 --- a/tests/038.out +++ b/tests/038.out @@ -1,6 +1,6 @@ QA output created by 038 using backend farm store -Cluster status: running +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 @@ -10,7 +10,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -20,7 +20,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -30,7 +30,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -40,7 +40,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -50,7 +50,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -60,7 +60,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 @@ -70,7 +70,7 @@ M Id Host:Port V-Nodes Zone - 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 +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 diff --git a/tests/043.out b/tests/043.out index 34d8029..b9c96ab 100644 --- a/tests/043.out +++ b/tests/043.out @@ -1,42 +1,42 @@ QA output created by 043 using backend farm store e6fffdc037c9f623d1c03fda7ef9cabf - -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] e6fffdc037c9f623d1c03fda7ef9cabf - -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] e6fffdc037c9f623d1c03fda7ef9cabf - -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] e6fffdc037c9f623d1c03fda7ef9cabf - -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] e6fffdc037c9f623d1c03fda7ef9cabf - -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] c2f72711cc1e4781841aa416f0b43e0d - -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -44,7 +44,7 @@ Epoch Time Version DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] c2f72711cc1e4781841aa416f0b43e0d - -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -52,7 +52,7 @@ Epoch Time Version DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] c2f72711cc1e4781841aa416f0b43e0d - -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -60,7 +60,7 @@ Epoch Time Version DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] c2f72711cc1e4781841aa416f0b43e0d - -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -68,7 +68,7 @@ Epoch Time Version DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] c2f72711cc1e4781841aa416f0b43e0d - -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -76,7 +76,7 @@ Epoch Time Version DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] 99970159bd855e83ced168eca46ae6c5 - -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -85,7 +85,7 @@ DATE 3 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] 99970159bd855e83ced168eca46ae6c5 - -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -94,7 +94,7 @@ DATE 3 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] 99970159bd855e83ced168eca46ae6c5 - -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -103,7 +103,7 @@ DATE 3 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] 99970159bd855e83ced168eca46ae6c5 - -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE diff --git a/tests/051.out b/tests/051.out index 23d43ee..1e1967d 100644 --- a/tests/051.out +++ b/tests/051.out @@ -6,7 +6,7 @@ Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE diff --git a/tests/052.out b/tests/052.out index 91cd059..526cfc0 100644 --- a/tests/052.out +++ b/tests/052.out @@ -1,6 +1,6 @@ QA output created by 052 using backend farm store -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -50,7 +50,7 @@ fixed missing 7c2b2500000001 fixed missing 7c2b2500000002 fixed missing 7c2b2500000003 fixed missing 7c2b2500000004 -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -59,7 +59,7 @@ DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] Name Id Size Used Shared Creation time VDI id Copies Tag test 0 20 MB 20 MB 0.0 MB DATE 7c2b25 3 -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -68,7 +68,7 @@ DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] Name Id Size Used Shared Creation time VDI id Copies Tag test 0 20 MB 20 MB 0.0 MB DATE 7c2b25 3 -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -77,7 +77,7 @@ DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] Name Id Size Used Shared Creation time VDI id Copies Tag test 0 20 MB 20 MB 0.0 MB DATE 7c2b25 3 -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -86,7 +86,7 @@ DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] Name Id Size Used Shared Creation time VDI id Copies Tag test 0 20 MB 20 MB 0.0 MB DATE 7c2b25 3 -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -96,7 +96,7 @@ DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] Name Id Size Used Shared Creation time VDI id Copies Tag test 0 20 MB 20 MB 0.0 MB DATE 7c2b25 3 -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -106,7 +106,7 @@ DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] Name Id Size Used Shared Creation time VDI id Copies Tag test 0 20 MB 20 MB 0.0 MB DATE 7c2b25 3 -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -116,7 +116,7 @@ DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] Name Id Size Used Shared Creation time VDI id Copies Tag test 0 20 MB 20 MB 0.0 MB DATE 7c2b25 3 -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -126,7 +126,7 @@ DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] Name Id Size Used Shared Creation time VDI id Copies Tag test 0 20 MB 20 MB 0.0 MB DATE 7c2b25 3 -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE diff --git a/tests/053.out b/tests/053.out index 587dbc9..764cf87 100644 --- a/tests/053.out +++ b/tests/053.out @@ -1,54 +1,54 @@ QA output created by 053 using backend farm store -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -56,7 +56,7 @@ Epoch Time Version DATE 3 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004, 127.0.0.1:7005] DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -64,7 +64,7 @@ Epoch Time Version DATE 3 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004, 127.0.0.1:7005] DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -72,7 +72,7 @@ Epoch Time Version DATE 3 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004, 127.0.0.1:7005] DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -80,7 +80,7 @@ Epoch Time Version DATE 3 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004, 127.0.0.1:7005] DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -88,7 +88,7 @@ Epoch Time Version DATE 3 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004, 127.0.0.1:7005] DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -96,7 +96,7 @@ Epoch Time Version DATE 3 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004, 127.0.0.1:7005] DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -106,7 +106,7 @@ DATE 4 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7004, 127 DATE 3 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004, 127.0.0.1:7005] DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -116,7 +116,7 @@ DATE 4 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7004, 127 DATE 3 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004, 127.0.0.1:7005] DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -126,7 +126,7 @@ DATE 4 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7004, 127 DATE 3 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004, 127.0.0.1:7005] DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE diff --git a/tests/054.out b/tests/054.out index 5174148..0263771 100644 --- a/tests/054.out +++ b/tests/054.out @@ -1,12 +1,12 @@ QA output created by 054 using backend farm store -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE diff --git a/tests/055.out b/tests/055.out index e28188e..feb6e01 100644 --- a/tests/055.out +++ b/tests/055.out @@ -1,21 +1,21 @@ QA output created by 055 using backend farm store finish check&repair test -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] finish check&repair test -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE Epoch Time Version DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] finish check&repair test -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -23,7 +23,7 @@ Epoch Time Version DATE 2 [127.0.0.1:7000, 127.0.0.1:7002] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] finish check&repair test -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE diff --git a/tests/056.out b/tests/056.out index 389e6f4..593c8c8 100644 --- a/tests/056.out +++ b/tests/056.out @@ -1,7 +1,7 @@ QA output created by 056 using backend farm store finish check&repair test -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -9,7 +9,7 @@ Epoch Time Version DATE 2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003] DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] finish check&repair test -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE diff --git a/tests/057.out b/tests/057.out index 2039eb0..5f721c7 100644 --- a/tests/057.out +++ b/tests/057.out @@ -11,7 +11,7 @@ Id Used Free Path 3 20 MB MASKED GB STORE/0/d3 4 24 MB MASKED GB STORE/0/d4 finish check&repair test -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -32,7 +32,7 @@ Id Used Free Path 1 32 MB MASKED GB STORE/0/d3 2 36 MB MASKED GB STORE/0/d4 finish check&repair test -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE @@ -46,7 +46,7 @@ Id Used Free Path 0 28 MB MASKED GB STORE/0/d2 1 32 MB MASKED GB STORE/0/d3 2 36 MB MASKED GB STORE/0/d4 -Cluster status: running +Cluster status: running, auto-recovery enabled Cluster created at DATE -- 1.7.9.5 |