[sheepdog] [PATCH] dog: use right redundancy copies when rollback VDI

2015-03-02 Thread Wang dongxu
This commit fix Bug #1427094 https://bugs.launchpad.net/sheepdog-project/+bug/1427094 "redundancy change to the cluster default when rollback VDI" While rollback from a snapshot, VDI should use snapshot's nr_copies. Signed-off-by: Wang dongxu --- dog/vdi.c | 2 +- 1 file chang

[sheepdog] [PATCH 5/5] tests:fix vnode strategy output

2015-02-11 Thread Wang dongxu
since commit 5fed9d6, "Cluster vnodes strategy" information is produced, so fix them in test cases. Signed-off-by: Wang dongxu --- tests/functional/030.out | 1 + tests/functional/096.out | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tests/functional/030.out b/tests/function

[sheepdog] [PATCH 3/5] tests: correct vdi list

2015-02-11 Thread Wang dongxu
dog vdi list add column "Block Size Shift", add them to test cases. Signed-off-by: Wang dongxu --- tests/functional/073.out | 2 +- tests/functional/081.out | 6 +++--- tests/functional/082.out | 6 +++--- tests/functional/087.out | 10 +- tests/functional/089.out | 2

[sheepdog] [PATCH 2/5] tests: avoid qemu-img snapshot warning

2015-02-11 Thread Wang dongxu
"qemu-img snapshot" option will print warining message while probing a raw image, so filter them using sed. Signed-off-by: Wang dongxu --- tests/functional/013 | 2 +- tests/functional/017 | 12 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/functi

[sheepdog] [PATCH 4/5] tests: fix content of 052.out

2015-02-11 Thread Wang dongxu
Since code is "printf("%s\n", sd_strerror(rsp->result));", 052.out should add a new line. Signed-off-by: Wang dongxu --- tests/functional/052.out | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/functional/052.out b/tests/functional/052.out index 2a533d5..f44

[sheepdog] [PATCH 0/5] tests: fix some test cases to suitable for new sheepdog and QEMU

2015-02-11 Thread Wang dongxu
QEMU and sheepdog changes some output formats while upgrading to new version, so tests/functional test cases need some changes. Wang dongxu (5): tests: avoid qemu-io warning tests: avoid qemu-img snapshot warning tests: correct vdi list tests: fix content of 052.out tests:fix vnode

[sheepdog] [PATCH 1/5] tests: avoid qemu-io warning

2015-02-11 Thread Wang dongxu
qemu-io command add a warning message because probing a raw img is dangerous. So add "-f" option to avoid this. Signed-off-by: Wang dongxu --- tests/functional/013 | 6 +++--- tests/functional/017 | 2 +- tests/functional/024 | 6 +++--- tests/functional/025 | 4 ++-- tests/func

[sheepdog] [PATCH] Change tests outputs to be suitable for new cluster info format

2015-02-02 Thread Wang Dongxu
Since commit 4fea6f95a2de90f45f90415f289083c6b29120a7, dog cluster info change its output format, to make sure tests/functional cases are suitable for the new format, modified these output. Signed-off-by: Wang Dongxu --- tests/functional/001.out | 36 +++--- tests/functional/002.out

[sheepdog] [PATCH] Change tests outputs to be suitable for new cluster info format

2015-02-02 Thread Wang Dongxu
From: Wang Dongxu Since commit 4fea6f95a2de90f45f90415f289083c6b29120a7, dog cluster info change its output format, to make sure tests/functional cases are suitable for the new format, modified these output. Signed-off-by: Wang Dongxu --- tests/functional/001.out | 36 +++--- tests