[sheepdog] [PATCH v5 01/16] sheep: change default store driver from "farm" to "plain"
Kai Zhang
kyle at zelin.io
Mon May 20 09:50:31 CEST 2013
1. modified collie/cluster.c to change default store driver to plain
2. remove tests/030 and tests/030.out, because snapshot is not available to plain store
3. modified tests/*.out, replace "farm" with "plain"
Signed-off-by: Kai Zhang <kyle at zelin.io>
---
collie/cluster.c | 2 +-
tests/001.out | 2 +-
tests/002.out | 2 +-
tests/003.out | 2 +-
tests/004.out | 2 +-
tests/005.out | 2 +-
tests/006.out | 2 +-
tests/007.out | 4 ++--
tests/008.out | 2 +-
tests/009.out | 2 +-
tests/010.out | 2 +-
tests/013.out | 2 +-
tests/014.out | 2 +-
tests/015.out | 2 +-
tests/016.out | 2 +-
tests/017.out | 2 +-
tests/018.out | 2 +-
tests/019.out | 2 +-
tests/020.out | 2 +-
tests/021.out | 2 +-
tests/022.out | 2 +-
tests/023.out | 2 +-
tests/024.out | 2 +-
tests/025.out | 2 +-
tests/026.out | 2 +-
tests/027.out | 2 +-
tests/028.out | 2 +-
tests/029.out | 2 +-
tests/030 | 46 ----------------------------------------------
tests/030.out | 7 -------
tests/031.out | 2 +-
tests/032.out | 2 +-
tests/033.out | 2 +-
tests/034.out | 2 +-
tests/035.out | 2 +-
tests/036.out | 2 +-
tests/037.out | 2 +-
tests/038.out | 2 +-
tests/039.out | 2 +-
tests/040.out | 2 +-
tests/041.out | 2 +-
tests/042.out | 2 +-
tests/043.out | 2 +-
tests/044.out | 2 +-
tests/045.out | 2 +-
tests/046.out | 2 +-
tests/047.out | 2 +-
tests/048.out | 2 +-
tests/049.out | 2 +-
tests/050.out | 2 +-
tests/051.out | 2 +-
tests/052.out | 2 +-
tests/053.out | 2 +-
tests/054.out | 2 +-
tests/055.out | 2 +-
tests/056.out | 2 +-
tests/057.out | 2 +-
tests/058.out | 2 +-
tests/059.out | 2 +-
59 files changed, 58 insertions(+), 111 deletions(-)
delete mode 100755 tests/030
delete mode 100644 tests/030.out
diff --git a/collie/cluster.c b/collie/cluster.c
index 7cdbba0..cb92be9 100644
--- a/collie/cluster.c
+++ b/collie/cluster.c
@@ -37,7 +37,7 @@ static struct cluster_cmd_data {
char name[STORE_LEN];
} cluster_cmd_data;
-#define DEFAULT_STORE "farm"
+#define DEFAULT_STORE "plain"
static int list_store(void)
{
diff --git a/tests/001.out b/tests/001.out
index f548cf2..7b073c5 100644
--- a/tests/001.out
+++ b/tests/001.out
@@ -1,5 +1,5 @@
QA output created by 001
-using backend farm store
+using backend plain store
check whether Sheepdog is running with only one node
Cluster status: running
diff --git a/tests/002.out b/tests/002.out
index 75a2756..164df47 100644
--- a/tests/002.out
+++ b/tests/002.out
@@ -1,5 +1,5 @@
QA output created by 002
-using backend farm store
+using backend plain store
check whether Sheepdog is running with only one node
Cluster status: running
diff --git a/tests/003.out b/tests/003.out
index 1c2b9c8..d45364d 100644
--- a/tests/003.out
+++ b/tests/003.out
@@ -1,5 +1,5 @@
QA output created by 003
-using backend farm store
+using backend plain store
check whether Sheepdog is running with only one node
Cluster status: running
diff --git a/tests/004.out b/tests/004.out
index a2cc2e0..b99cab6 100644
--- a/tests/004.out
+++ b/tests/004.out
@@ -1,5 +1,5 @@
QA output created by 004
-using backend farm store
+using backend plain store
check whether Sheepdog is running with only one node
Cluster status: running
diff --git a/tests/005.out b/tests/005.out
index 1cc8369..5a60ecf 100644
--- a/tests/005.out
+++ b/tests/005.out
@@ -1,5 +1,5 @@
QA output created by 005
-using backend farm store
+using backend plain store
check whether Sheepdog is working with two nodes
Cluster status: running
diff --git a/tests/006.out b/tests/006.out
index 251372f..16f52a8 100644
--- a/tests/006.out
+++ b/tests/006.out
@@ -1,3 +1,3 @@
QA output created by 006
-using backend farm store
+using backend plain store
check whether all nodes have the same cluster info
diff --git a/tests/007.out b/tests/007.out
index 91770f3..2eb8515 100644
--- a/tests/007.out
+++ b/tests/007.out
@@ -1,4 +1,4 @@
QA output created by 007
-using backend farm store
-using backend farm store
+using backend plain store
+using backend plain store
success
diff --git a/tests/008.out b/tests/008.out
index 54f0186..4e2da47 100644
--- a/tests/008.out
+++ b/tests/008.out
@@ -1,4 +1,4 @@
QA output created by 008
-using backend farm store
+using backend plain store
begin kill
wait for object recovery to finish
diff --git a/tests/009.out b/tests/009.out
index 0664a8d..0cb0dca 100644
--- a/tests/009.out
+++ b/tests/009.out
@@ -1,2 +1,2 @@
QA output created by 009
-using backend farm store
+using backend plain store
diff --git a/tests/010.out b/tests/010.out
index 293da8a..13ab675 100644
--- a/tests/010.out
+++ b/tests/010.out
@@ -1,5 +1,5 @@
QA output created by 010
-using backend farm store
+using backend plain store
Cluster recovery: disable
STORE/0/obj/007c2b2500000000
STORE/0/obj/007c2b2500000001
diff --git a/tests/013.out b/tests/013.out
index 467db8b..fd4bf9c 100644
--- a/tests/013.out
+++ b/tests/013.out
@@ -1,5 +1,5 @@
QA output created by 013
-using backend farm store
+using backend plain store
Formatting 'sheepdog:test', fmt=raw size=4294967296
wrote 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
diff --git a/tests/014.out b/tests/014.out
index a54c035..c58fdf0 100644
--- a/tests/014.out
+++ b/tests/014.out
@@ -1,5 +1,5 @@
QA output created by 014
-using backend farm store
+using backend plain store
key shouldn't be found
Attribute 'key' not found
key shouldn't be found
diff --git a/tests/015.out b/tests/015.out
index ca5c3f4..28637c0 100644
--- a/tests/015.out
+++ b/tests/015.out
@@ -1,5 +1,5 @@
QA output created by 015
-using backend farm store
+using backend plain store
The attribute 'lock' already exists
The attribute 'lock' already exists
The attribute 'lock' already exists
diff --git a/tests/016.out b/tests/016.out
index 6042ff3..f142181 100644
--- a/tests/016.out
+++ b/tests/016.out
@@ -1,5 +1,5 @@
QA output created by 016
-using backend farm store
+using backend plain store
there should be no vdi
Name Id Size Used Shared Creation time VDI id Copies Tag
there should be no object
diff --git a/tests/017.out b/tests/017.out
index 0fb6c46..f1af9c3 100644
--- a/tests/017.out
+++ b/tests/017.out
@@ -1,5 +1,5 @@
QA output created by 017
-using backend farm store
+using backend plain store
Formatting 'sheepdog:test', fmt=raw size=4294967296
Formatting 'sheepdog:test2', fmt=raw size=4294967296
wrote 512/512 bytes at offset 0
diff --git a/tests/018.out b/tests/018.out
index 5135743..210d7e6 100644
--- a/tests/018.out
+++ b/tests/018.out
@@ -1,2 +1,2 @@
QA output created by 018
-using backend farm store
+using backend plain store
diff --git a/tests/019.out b/tests/019.out
index 98ba52a..f927361 100644
--- a/tests/019.out
+++ b/tests/019.out
@@ -1,2 +1,2 @@
QA output created by 019
-using backend farm store
+using backend plain store
diff --git a/tests/020.out b/tests/020.out
index b6765d0..1c3490c 100644
--- a/tests/020.out
+++ b/tests/020.out
@@ -1,2 +1,2 @@
QA output created by 020
-using backend farm store
+using backend plain store
diff --git a/tests/021.out b/tests/021.out
index 147988a..19f8727 100644
--- a/tests/021.out
+++ b/tests/021.out
@@ -1,2 +1,2 @@
QA output created by 021
-using backend farm store
+using backend plain store
diff --git a/tests/022.out b/tests/022.out
index 9d252af..fd78a89 100644
--- a/tests/022.out
+++ b/tests/022.out
@@ -1,4 +1,4 @@
QA output created by 022
-using backend farm store
+using backend plain store
creating a VDI should fail without data nodes available
Failed to create VDI test: IO has halted as there are too few living nodes
diff --git a/tests/023.out b/tests/023.out
index e5d2637..58c22a9 100644
--- a/tests/023.out
+++ b/tests/023.out
@@ -1,3 +1,3 @@
QA output created by 023
-using backend farm store
+using backend plain store
comparing cluster info for all sheep. Should be the same
diff --git a/tests/024.out b/tests/024.out
index 9f2b6d9..1db7985 100644
--- a/tests/024.out
+++ b/tests/024.out
@@ -1,7 +1,7 @@
QA output created by 024
starting first sheep
formatting cluster
-using backend farm store
+using backend plain store
creating vdi
filling test with data
wrote 314572800/314572800 bytes at offset 0
diff --git a/tests/025.out b/tests/025.out
index 3921e72..2e0eb5d 100644
--- a/tests/025.out
+++ b/tests/025.out
@@ -2,7 +2,7 @@ QA output created by 025
starting two sheep in the first zone
starting a sheep in the second zone
formatting cluster
-using backend farm store
+using backend plain store
creating vdi
filling test with data
wrote 20971520/20971520 bytes at offset 0
diff --git a/tests/026.out b/tests/026.out
index df897dc..db3b6d5 100644
--- a/tests/026.out
+++ b/tests/026.out
@@ -1,3 +1,3 @@
QA output created by 026
-using backend farm store
+using backend plain store
42
diff --git a/tests/027.out b/tests/027.out
index b40d391..5f32cdf 100644
--- a/tests/027.out
+++ b/tests/027.out
@@ -1,5 +1,5 @@
QA output created by 027
-using backend farm store
+using backend plain store
STORE/0/obj/80fd32fc00000000
STORE/1/obj/80fd32fc00000000
STORE/3/obj/80fd32fc00000000
diff --git a/tests/028.out b/tests/028.out
index 852a792..59641bf 100644
--- a/tests/028.out
+++ b/tests/028.out
@@ -1,5 +1,5 @@
QA output created by 028
-using backend farm store
+using backend plain store
9c7766570b3be3aff2724f587c2f4107 -
a6c5d562057d0b8e7c90df17e5ea9450 -
a6c5d562057d0b8e7c90df17e5ea9450 -
diff --git a/tests/029.out b/tests/029.out
index 050745a..2269ebc 100644
--- a/tests/029.out
+++ b/tests/029.out
@@ -1,5 +1,5 @@
QA output created by 029
-using backend farm store
+using backend plain store
Name Id Size Used Shared Creation time VDI id Copies Tag
test4 0 20 MB 20 MB 0.0 MB DATE fd2de3 4
test3 0 20 MB 20 MB 0.0 MB DATE fd3662 3
diff --git a/tests/030 b/tests/030
deleted file mode 100755
index 6c58658..0000000
--- a/tests/030
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# Test farm's cluster snapshot
-
-seq=`basename $0`
-echo "QA output created by $seq"
-
-here=`pwd`
-tmp=/tmp/$$
-status=1 # failure is the default!
-
-# get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-
-_cleanup
-
-for i in `seq 0 1`; do
- _start_sheep $i
-done
-
-_wait_for_sheep 2
-
-$COLLIE cluster format -c 2
-
-$COLLIE vdi create test 8M
-
-_random | $COLLIE vdi write test
-$COLLIE cluster snapshot
-$COLLIE vdi read test | md5sum > /tmp/csum.1
-
-_random | $COLLIE vdi write test
-$COLLIE cluster snapshot
-$COLLIE vdi read test | md5sum > /tmp/csum.2
-
-_random | $COLLIE vdi write test
-$COLLIE cluster snapshot -l | _filter_date
-
-$COLLIE cluster snapshot -R 2
-$COLLIE vdi read test | md5sum > /tmp/csum.22
-
-$COLLIE cluster snapshot -R 1
-$COLLIE vdi read test | md5sum > /tmp/csum.11
-
-diff -u /tmp/csum.1 /tmp/csum.11
-diff -u /tmp/csum.2 /tmp/csum.22
diff --git a/tests/030.out b/tests/030.out
deleted file mode 100644
index 605e0c1..0000000
--- a/tests/030.out
+++ /dev/null
@@ -1,7 +0,0 @@
-QA output created by 030
-using backend farm store
-Index Snapshot Time
-1 DATE
-2 DATE
-Cluster restore to the snapshot 2
-Cluster restore to the snapshot 1
diff --git a/tests/031.out b/tests/031.out
index 95e0f4b..4c66cff 100644
--- a/tests/031.out
+++ b/tests/031.out
@@ -1,5 +1,5 @@
QA output created by 031
-using backend farm store
+using backend plain store
Name Id Size Used Shared Creation time VDI id Copies Tag
test1 0 100 MB 0.0 MB 0.0 MB DATE fd32fc 1
test3 0 300 MB 0.0 MB 0.0 MB DATE fd3662 1
diff --git a/tests/032.out b/tests/032.out
index 6dbf578..aafbf24 100644
--- a/tests/032.out
+++ b/tests/032.out
@@ -1,5 +1,5 @@
QA output created by 032
-using backend farm store
+using backend plain store
9c7766570b3be3aff2724f587c2f4107 -
STORE/0/obj/807c2b2500000000
STORE/1/obj/807c2b2500000000
diff --git a/tests/033.out b/tests/033.out
index 640c26e..c674337 100644
--- a/tests/033.out
+++ b/tests/033.out
@@ -1,5 +1,5 @@
QA output created by 033
-using backend farm store
+using backend plain store
9c7766570b3be3aff2724f587c2f4107 -
STORE/0/obj/807c2b2500000000
STORE/1/obj/807c2b2500000000
diff --git a/tests/034.out b/tests/034.out
index 0aa4a57..1e30cd2 100644
--- a/tests/034.out
+++ b/tests/034.out
@@ -1,5 +1,5 @@
QA output created by 034
-using backend farm store
+using backend plain store
b26a14b4868dff70944564c6cb446e28 -
b26a14b4868dff70944564c6cb446e28 -
b26a14b4868dff70944564c6cb446e28 -
diff --git a/tests/035.out b/tests/035.out
index 1d8dca4..0ca0c37 100644
--- a/tests/035.out
+++ b/tests/035.out
@@ -1,5 +1,5 @@
QA output created by 035
-using backend farm store
+using backend plain store
Looking for the object 0x7c2b2500000000 (the inode vid 0x7c2b25 idx 0) with 2 nodes
127.0.0.1:7000 has the object (should be 2 copies)
diff --git a/tests/036.out b/tests/036.out
index f0a32a2..3eb3cd6 100644
--- a/tests/036.out
+++ b/tests/036.out
@@ -1,5 +1,5 @@
QA output created by 036
-using backend farm store
+using backend plain store
Cluster status: running
M Id Host:Port V-Nodes Zone
- 0 127.0.0.1:7000 64 0
diff --git a/tests/037.out b/tests/037.out
index a2e6ff9..d88d6e9 100644
--- a/tests/037.out
+++ b/tests/037.out
@@ -1,5 +1,5 @@
QA output created by 037
-using backend farm store
+using backend plain store
Cluster status: running
M Id Host:Port V-Nodes Zone
- 0 127.0.0.1:7000 64 0
diff --git a/tests/038.out b/tests/038.out
index 284a909..6f5e761 100644
--- a/tests/038.out
+++ b/tests/038.out
@@ -1,5 +1,5 @@
QA output created by 038
-using backend farm store
+using backend plain store
Cluster status: running
M Id Host:Port V-Nodes Zone
- 0 127.0.0.1:7000 64 0
diff --git a/tests/039.out b/tests/039.out
index 980a21f..6d1a1aa 100644
--- a/tests/039.out
+++ b/tests/039.out
@@ -1,5 +1,5 @@
QA output created by 039
-using backend farm store
+using backend plain store
wrote 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
wrote 512/512 bytes at offset 0
diff --git a/tests/040.out b/tests/040.out
index 7e7f4d3..70d243b 100644
--- a/tests/040.out
+++ b/tests/040.out
@@ -1,5 +1,5 @@
QA output created by 040
-using backend farm store
+using backend plain store
Name Id Size Used Shared Creation time VDI id Copies Tag
test 0 4.0 GB 0.0 MB 0.0 MB DATE 7c2b25 1
Name Id Size Used Shared Creation time VDI id Copies Tag
diff --git a/tests/041.out b/tests/041.out
index 34454ee..7e1316e 100644
--- a/tests/041.out
+++ b/tests/041.out
@@ -1,5 +1,5 @@
QA output created by 041
-using backend farm store
+using backend plain store
Name Id Size Used Shared Creation time VDI id Copies Tag
s test 1 12 MB 4.0 MB 0.0 MB DATE 7c2b25 3 snap1
s test 2 12 MB 4.0 MB 4.0 MB DATE 7c2b26 3 snap2
diff --git a/tests/042.out b/tests/042.out
index 5f9d81d..8f697c9 100644
--- a/tests/042.out
+++ b/tests/042.out
@@ -1,5 +1,5 @@
QA output created by 042
-using backend farm store
+using backend plain store
Failed to write object fd34af00000000: Server has no space for new objects
Failed to write VDI
Failed to write object fd32fc00000000: Server has no space for new objects
diff --git a/tests/043.out b/tests/043.out
index 34d8029..d78f8f5 100644
--- a/tests/043.out
+++ b/tests/043.out
@@ -1,5 +1,5 @@
QA output created by 043
-using backend farm store
+using backend plain store
e6fffdc037c9f623d1c03fda7ef9cabf -
Cluster status: running
diff --git a/tests/044.out b/tests/044.out
index d8e8ed3..c5edb88 100644
--- a/tests/044.out
+++ b/tests/044.out
@@ -1,5 +1,5 @@
QA output created by 044
-using backend farm store
+using backend plain store
there should be no vdi
Name Id Size Used Shared Creation time VDI id Copies Tag
there should be no object
diff --git a/tests/045.out b/tests/045.out
index e342606..dc00c8d 100644
--- a/tests/045.out
+++ b/tests/045.out
@@ -1,5 +1,5 @@
QA output created by 045
-using backend farm store
+using backend plain store
e0b27e7466a3c21d0a4dedfed8bb9184 -
f35835c0a25be5ee75a536d1816c1db4 -
0faf5f38c28a38a6db1e6dfcdf259141 -
diff --git a/tests/046.out b/tests/046.out
index 4ef4c09..432b882 100644
--- a/tests/046.out
+++ b/tests/046.out
@@ -1,5 +1,5 @@
QA output created by 046
-using backend farm store
+using backend plain store
delete snapshot image before current one
Name Id Size Used Shared Creation time VDI id Copies Tag
s test 1 4.0 GB 0.0 MB 0.0 MB DATE 7c2b25 2 snap
diff --git a/tests/047.out b/tests/047.out
index 75ee250..97bc1cf 100644
--- a/tests/047.out
+++ b/tests/047.out
@@ -1,5 +1,5 @@
QA output created by 047
-using backend farm store
+using backend plain store
Name Id Size Used Shared Creation time VDI id Copies Tag
test 0 4.0 GB 8.0 MB 0.0 MB DATE 7c2b25 1
hello sheepdog
diff --git a/tests/048.out b/tests/048.out
index ef80646..2ed1426 100644
--- a/tests/048.out
+++ b/tests/048.out
@@ -1,5 +1,5 @@
QA output created by 048
-using backend farm store
+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
diff --git a/tests/049.out b/tests/049.out
index cd0e6ec..c79fa33 100644
--- a/tests/049.out
+++ b/tests/049.out
@@ -1,2 +1,2 @@
QA output created by 049
-using backend farm store
+using backend plain store
diff --git a/tests/050.out b/tests/050.out
index d480685..275c10c 100644
--- a/tests/050.out
+++ b/tests/050.out
@@ -1,4 +1,4 @@
QA output created by 050
-using backend farm store
+using backend plain store
fallback done
finish check&repair test
diff --git a/tests/051.out b/tests/051.out
index 23d43ee..61c4e98 100644
--- a/tests/051.out
+++ b/tests/051.out
@@ -1,5 +1,5 @@
QA output created by 051
-using backend farm store
+using backend plain store
Cluster status: IO has halted as there are too few living nodes
Cluster created at DATE
diff --git a/tests/052.out b/tests/052.out
index 91cd059..de18123 100644
--- a/tests/052.out
+++ b/tests/052.out
@@ -1,5 +1,5 @@
QA output created by 052
-using backend farm store
+using backend plain store
Cluster status: running
Cluster created at DATE
diff --git a/tests/053.out b/tests/053.out
index 587dbc9..4f2379f 100644
--- a/tests/053.out
+++ b/tests/053.out
@@ -1,5 +1,5 @@
QA output created by 053
-using backend farm store
+using backend plain store
Cluster status: running
Cluster created at DATE
diff --git a/tests/054.out b/tests/054.out
index 5174148..809da29 100644
--- a/tests/054.out
+++ b/tests/054.out
@@ -1,5 +1,5 @@
QA output created by 054
-using backend farm store
+using backend plain store
Cluster status: running
Cluster created at DATE
diff --git a/tests/055.out b/tests/055.out
index e28188e..4f843a1 100644
--- a/tests/055.out
+++ b/tests/055.out
@@ -1,5 +1,5 @@
QA output created by 055
-using backend farm store
+using backend plain store
finish check&repair test
Cluster status: running
diff --git a/tests/056.out b/tests/056.out
index 389e6f4..6a957f7 100644
--- a/tests/056.out
+++ b/tests/056.out
@@ -1,5 +1,5 @@
QA output created by 056
-using backend farm store
+using backend plain store
finish check&repair test
Cluster status: running
diff --git a/tests/057.out b/tests/057.out
index 2039eb0..098a829 100644
--- a/tests/057.out
+++ b/tests/057.out
@@ -1,5 +1,5 @@
QA output created by 057
-using backend farm store
+using backend plain store
Id Used Free Path
0 32 MB MASKED GB STORE/0/d0
1 32 MB MASKED GB STORE/0/d1
diff --git a/tests/058.out b/tests/058.out
index 140e5c0..f736eaa 100644
--- a/tests/058.out
+++ b/tests/058.out
@@ -1,5 +1,5 @@
QA output created by 058
-using backend farm store
+using backend plain store
Id Size Used Use%
0 1000 MB 104 MB 10%
1 1000 MB 104 MB 10%
diff --git a/tests/059.out b/tests/059.out
index 97e7001..8feae6b 100644
--- a/tests/059.out
+++ b/tests/059.out
@@ -1,5 +1,5 @@
QA output created by 059
-using backend farm store
+using backend plain store
Name Id Size Used Shared Creation time VDI id Copies Tag
s test 1 4.0 MB 4.0 MB 0.0 MB DATE 7c2b25 3 snap1
s test 2 4.0 MB 4.0 MB 0.0 MB DATE 7c2b26 3 snap2
--
1.7.1
More information about the sheepdog
mailing list