Currently, some test cases assume that we use /tmp/sheepdog for sheep
store. This patch normalizes their outputs and allows us to run tests
on another directory.
Signed-off-by: MORITA Kazutaka <morita.kazut...@lab.ntt.co.jp>
---
tests/010 | 14 +-
tests/010.out | 420 ++++++++++++++++++++++++++--------------------------
tests/020 | 2 +-
tests/027 | 2 +-
tests/027.out | 6 +-
tests/032 | 6 +-
tests/032.out | 172 ++++++++++-----------
tests/033 | 6 +-
tests/033.out | 172 ++++++++++-----------
tests/042 | 2 +-
tests/042.out | 92 ++++++------
tests/057 | 12 +-
tests/057.out | 38 ++---
tests/common.filter | 6 +
14 files changed, 478 insertions(+), 472 deletions(-)
diff --git a/tests/010 b/tests/010
index 71d175f..b8f9c36 100755
--- a/tests/010
+++ b/tests/010
@@ -31,14 +31,14 @@ for i in `seq 0 7`; do
echo $i | $COLLIE vdi write test $((i * 4 * 1024 * 1024)) 512
done
-ls $STORE/*/obj/* | sort
+ls $STORE/*/obj/* | _filter_store | sort
_kill_sheep 3
_kill_sheep 4
sleep 2
$COLLIE cluster info | head -6 | _filter_cluster_info
-ls $STORE/*/obj/* | sort
+ls $STORE/*/obj/* | _filter_store | sort
# overwrite the objects to invoke object recovery
for i in `seq 4 7`; do
@@ -47,12 +47,12 @@ for i in `seq 4 7`; do
done
$COLLIE cluster info | head -6 | _filter_cluster_info
-ls $STORE/*/obj/* | sort
+ls $STORE/*/obj/* | _filter_store | sort
$COLLIE cluster recover enable
_wait_for_sheep_recovery 0
$COLLIE cluster info | head -6 | _filter_cluster_info
-ls $STORE/*/obj/* | sort
+ls $STORE/*/obj/* | _filter_store | sort
$COLLIE cluster recover disable
for i in `seq 3 7`; do
@@ -62,7 +62,7 @@ done
_wait_for_sheep 8
sleep 2
$COLLIE cluster info | head -6 | _filter_cluster_info
-ls $STORE/*/obj/* | sort
+ls $STORE/*/obj/* | _filter_store | sort
# overwrite the objects to invoke object recovery
for i in `seq 0 3`; do
@@ -71,9 +71,9 @@ for i in `seq 0 3`; do
done
$COLLIE cluster info | head -6 | _filter_cluster_info
-ls $STORE/*/obj/* | sort
+ls $STORE/*/obj/* | _filter_store | sort
$COLLIE cluster recover enable
_wait_for_sheep_recovery 0
$COLLIE cluster info | head -6 | _filter_cluster_info
-ls $STORE/*/obj/* | sort
+ls $STORE/*/obj/* | _filter_store | sort
diff --git a/tests/010.out b/tests/010.out
index 61b23b9..7efee01 100644
--- a/tests/010.out
+++ b/tests/010.out
@@ -1,66 +1,66 @@
QA output created by 010
using backend farm store
Cluster recovery: disable
-/tmp/sheepdog/0/obj/007c2b2500000000
-/tmp/sheepdog/0/obj/007c2b2500000001
-/tmp/sheepdog/0/obj/007c2b2500000002
-/tmp/sheepdog/0/obj/007c2b2500000004
-/tmp/sheepdog/0/obj/007c2b2500000005
-/tmp/sheepdog/0/obj/007c2b2500000007
-/tmp/sheepdog/0/obj/807c2b2500000000
-/tmp/sheepdog/1/obj/007c2b2500000000
-/tmp/sheepdog/1/obj/007c2b2500000001
-/tmp/sheepdog/1/obj/007c2b2500000002
-/tmp/sheepdog/1/obj/007c2b2500000003
-/tmp/sheepdog/1/obj/807c2b2500000000
-/tmp/sheepdog/2/obj/007c2b2500000000
-/tmp/sheepdog/2/obj/007c2b2500000003
-/tmp/sheepdog/2/obj/007c2b2500000006
-/tmp/sheepdog/2/obj/007c2b2500000007
-/tmp/sheepdog/2/obj/807c2b2500000000
-/tmp/sheepdog/3/obj/007c2b2500000004
-/tmp/sheepdog/3/obj/007c2b2500000005
-/tmp/sheepdog/3/obj/007c2b2500000006
-/tmp/sheepdog/3/obj/007c2b2500000007
-/tmp/sheepdog/4/obj/007c2b2500000001
-/tmp/sheepdog/4/obj/007c2b2500000002
-/tmp/sheepdog/4/obj/007c2b2500000003
-/tmp/sheepdog/4/obj/007c2b2500000004
-/tmp/sheepdog/4/obj/007c2b2500000005
-/tmp/sheepdog/4/obj/007c2b2500000006
+STORE/0/obj/007c2b2500000000
+STORE/0/obj/007c2b2500000001
+STORE/0/obj/007c2b2500000002
+STORE/0/obj/007c2b2500000004
+STORE/0/obj/007c2b2500000005
+STORE/0/obj/007c2b2500000007
+STORE/0/obj/807c2b2500000000
+STORE/1/obj/007c2b2500000000
+STORE/1/obj/007c2b2500000001
+STORE/1/obj/007c2b2500000002
+STORE/1/obj/007c2b2500000003
+STORE/1/obj/807c2b2500000000
+STORE/2/obj/007c2b2500000000
+STORE/2/obj/007c2b2500000003
+STORE/2/obj/007c2b2500000006
+STORE/2/obj/007c2b2500000007
+STORE/2/obj/807c2b2500000000
+STORE/3/obj/007c2b2500000004
+STORE/3/obj/007c2b2500000005
+STORE/3/obj/007c2b2500000006
+STORE/3/obj/007c2b2500000007
+STORE/4/obj/007c2b2500000001
+STORE/4/obj/007c2b2500000002
+STORE/4/obj/007c2b2500000003
+STORE/4/obj/007c2b2500000004
+STORE/4/obj/007c2b2500000005
+STORE/4/obj/007c2b2500000006
Cluster status: running
Cluster created at DATE
Epoch Time Version
DATE 3 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
-/tmp/sheepdog/0/obj/007c2b2500000000
-/tmp/sheepdog/0/obj/007c2b2500000001
-/tmp/sheepdog/0/obj/007c2b2500000002
-/tmp/sheepdog/0/obj/007c2b2500000004
-/tmp/sheepdog/0/obj/007c2b2500000005
-/tmp/sheepdog/0/obj/007c2b2500000007
-/tmp/sheepdog/0/obj/807c2b2500000000
-/tmp/sheepdog/1/obj/007c2b2500000000
-/tmp/sheepdog/1/obj/007c2b2500000001
-/tmp/sheepdog/1/obj/007c2b2500000002
-/tmp/sheepdog/1/obj/007c2b2500000003
-/tmp/sheepdog/1/obj/807c2b2500000000
-/tmp/sheepdog/2/obj/007c2b2500000000
-/tmp/sheepdog/2/obj/007c2b2500000003
-/tmp/sheepdog/2/obj/007c2b2500000006
-/tmp/sheepdog/2/obj/007c2b2500000007
-/tmp/sheepdog/2/obj/807c2b2500000000
-/tmp/sheepdog/3/obj/007c2b2500000004
-/tmp/sheepdog/3/obj/007c2b2500000005
-/tmp/sheepdog/3/obj/007c2b2500000006
-/tmp/sheepdog/3/obj/007c2b2500000007
-/tmp/sheepdog/4/obj/007c2b2500000001
-/tmp/sheepdog/4/obj/007c2b2500000002
-/tmp/sheepdog/4/obj/007c2b2500000003
-/tmp/sheepdog/4/obj/007c2b2500000004
-/tmp/sheepdog/4/obj/007c2b2500000005
-/tmp/sheepdog/4/obj/007c2b2500000006
+STORE/0/obj/007c2b2500000000
+STORE/0/obj/007c2b2500000001
+STORE/0/obj/007c2b2500000002
+STORE/0/obj/007c2b2500000004
+STORE/0/obj/007c2b2500000005
+STORE/0/obj/007c2b2500000007
+STORE/0/obj/807c2b2500000000
+STORE/1/obj/007c2b2500000000
+STORE/1/obj/007c2b2500000001
+STORE/1/obj/007c2b2500000002
+STORE/1/obj/007c2b2500000003
+STORE/1/obj/807c2b2500000000
+STORE/2/obj/007c2b2500000000
+STORE/2/obj/007c2b2500000003
+STORE/2/obj/007c2b2500000006
+STORE/2/obj/007c2b2500000007
+STORE/2/obj/807c2b2500000000
+STORE/3/obj/007c2b2500000004
+STORE/3/obj/007c2b2500000005
+STORE/3/obj/007c2b2500000006
+STORE/3/obj/007c2b2500000007
+STORE/4/obj/007c2b2500000001
+STORE/4/obj/007c2b2500000002
+STORE/4/obj/007c2b2500000003
+STORE/4/obj/007c2b2500000004
+STORE/4/obj/007c2b2500000005
+STORE/4/obj/007c2b2500000006
a8775e30ddc5eda14d76e5361a514392 -
8124234db4755d4772c3440f2cbd1ecb -
62630992718e77c73873ce1672d80786 -
@@ -71,40 +71,40 @@ Cluster created at DATE
Epoch Time Version
DATE 3 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
-/tmp/sheepdog/0/obj/007c2b2500000000
-/tmp/sheepdog/0/obj/007c2b2500000001
-/tmp/sheepdog/0/obj/007c2b2500000002
-/tmp/sheepdog/0/obj/007c2b2500000004
-/tmp/sheepdog/0/obj/007c2b2500000005
-/tmp/sheepdog/0/obj/007c2b2500000006
-/tmp/sheepdog/0/obj/007c2b2500000007
-/tmp/sheepdog/0/obj/807c2b2500000000
-/tmp/sheepdog/1/obj/007c2b2500000000
-/tmp/sheepdog/1/obj/007c2b2500000001
-/tmp/sheepdog/1/obj/007c2b2500000002
-/tmp/sheepdog/1/obj/007c2b2500000003
-/tmp/sheepdog/1/obj/007c2b2500000004
-/tmp/sheepdog/1/obj/007c2b2500000005
-/tmp/sheepdog/1/obj/007c2b2500000006
-/tmp/sheepdog/1/obj/007c2b2500000007
-/tmp/sheepdog/1/obj/807c2b2500000000
-/tmp/sheepdog/2/obj/007c2b2500000000
-/tmp/sheepdog/2/obj/007c2b2500000003
-/tmp/sheepdog/2/obj/007c2b2500000004
-/tmp/sheepdog/2/obj/007c2b2500000005
-/tmp/sheepdog/2/obj/007c2b2500000006
-/tmp/sheepdog/2/obj/007c2b2500000007
-/tmp/sheepdog/2/obj/807c2b2500000000
-/tmp/sheepdog/3/obj/007c2b2500000004
-/tmp/sheepdog/3/obj/007c2b2500000005
-/tmp/sheepdog/3/obj/007c2b2500000006
-/tmp/sheepdog/3/obj/007c2b2500000007
-/tmp/sheepdog/4/obj/007c2b2500000001
-/tmp/sheepdog/4/obj/007c2b2500000002
-/tmp/sheepdog/4/obj/007c2b2500000003
-/tmp/sheepdog/4/obj/007c2b2500000004
-/tmp/sheepdog/4/obj/007c2b2500000005
-/tmp/sheepdog/4/obj/007c2b2500000006
+STORE/0/obj/007c2b2500000000
+STORE/0/obj/007c2b2500000001
+STORE/0/obj/007c2b2500000002
+STORE/0/obj/007c2b2500000004
+STORE/0/obj/007c2b2500000005
+STORE/0/obj/007c2b2500000006
+STORE/0/obj/007c2b2500000007
+STORE/0/obj/807c2b2500000000
+STORE/1/obj/007c2b2500000000
+STORE/1/obj/007c2b2500000001
+STORE/1/obj/007c2b2500000002
+STORE/1/obj/007c2b2500000003
+STORE/1/obj/007c2b2500000004
+STORE/1/obj/007c2b2500000005
+STORE/1/obj/007c2b2500000006
+STORE/1/obj/007c2b2500000007
+STORE/1/obj/807c2b2500000000
+STORE/2/obj/007c2b2500000000
+STORE/2/obj/007c2b2500000003
+STORE/2/obj/007c2b2500000004
+STORE/2/obj/007c2b2500000005
+STORE/2/obj/007c2b2500000006
+STORE/2/obj/007c2b2500000007
+STORE/2/obj/807c2b2500000000
+STORE/3/obj/007c2b2500000004
+STORE/3/obj/007c2b2500000005
+STORE/3/obj/007c2b2500000006
+STORE/3/obj/007c2b2500000007
+STORE/4/obj/007c2b2500000001
+STORE/4/obj/007c2b2500000002
+STORE/4/obj/007c2b2500000003
+STORE/4/obj/007c2b2500000004
+STORE/4/obj/007c2b2500000005
+STORE/4/obj/007c2b2500000006
Cluster recovery: enable
Cluster status: running
@@ -112,43 +112,43 @@ Cluster created at DATE
Epoch Time Version
DATE 3 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
-/tmp/sheepdog/0/obj/007c2b2500000000
-/tmp/sheepdog/0/obj/007c2b2500000001
-/tmp/sheepdog/0/obj/007c2b2500000002
-/tmp/sheepdog/0/obj/007c2b2500000003
-/tmp/sheepdog/0/obj/007c2b2500000004
-/tmp/sheepdog/0/obj/007c2b2500000005
-/tmp/sheepdog/0/obj/007c2b2500000006
-/tmp/sheepdog/0/obj/007c2b2500000007
-/tmp/sheepdog/0/obj/807c2b2500000000
-/tmp/sheepdog/1/obj/007c2b2500000000
-/tmp/sheepdog/1/obj/007c2b2500000001
-/tmp/sheepdog/1/obj/007c2b2500000002
-/tmp/sheepdog/1/obj/007c2b2500000003
-/tmp/sheepdog/1/obj/007c2b2500000004
-/tmp/sheepdog/1/obj/007c2b2500000005
-/tmp/sheepdog/1/obj/007c2b2500000006
-/tmp/sheepdog/1/obj/007c2b2500000007
-/tmp/sheepdog/1/obj/807c2b2500000000
-/tmp/sheepdog/2/obj/007c2b2500000000
-/tmp/sheepdog/2/obj/007c2b2500000001
-/tmp/sheepdog/2/obj/007c2b2500000002
-/tmp/sheepdog/2/obj/007c2b2500000003
-/tmp/sheepdog/2/obj/007c2b2500000004
-/tmp/sheepdog/2/obj/007c2b2500000005
-/tmp/sheepdog/2/obj/007c2b2500000006
-/tmp/sheepdog/2/obj/007c2b2500000007
-/tmp/sheepdog/2/obj/807c2b2500000000
-/tmp/sheepdog/3/obj/007c2b2500000004
-/tmp/sheepdog/3/obj/007c2b2500000005
-/tmp/sheepdog/3/obj/007c2b2500000006
-/tmp/sheepdog/3/obj/007c2b2500000007
-/tmp/sheepdog/4/obj/007c2b2500000001
-/tmp/sheepdog/4/obj/007c2b2500000002
-/tmp/sheepdog/4/obj/007c2b2500000003
-/tmp/sheepdog/4/obj/007c2b2500000004
-/tmp/sheepdog/4/obj/007c2b2500000005
-/tmp/sheepdog/4/obj/007c2b2500000006
+STORE/0/obj/007c2b2500000000
+STORE/0/obj/007c2b2500000001
+STORE/0/obj/007c2b2500000002
+STORE/0/obj/007c2b2500000003
+STORE/0/obj/007c2b2500000004
+STORE/0/obj/007c2b2500000005
+STORE/0/obj/007c2b2500000006
+STORE/0/obj/007c2b2500000007
+STORE/0/obj/807c2b2500000000
+STORE/1/obj/007c2b2500000000
+STORE/1/obj/007c2b2500000001
+STORE/1/obj/007c2b2500000002
+STORE/1/obj/007c2b2500000003
+STORE/1/obj/007c2b2500000004
+STORE/1/obj/007c2b2500000005
+STORE/1/obj/007c2b2500000006
+STORE/1/obj/007c2b2500000007
+STORE/1/obj/807c2b2500000000
+STORE/2/obj/007c2b2500000000
+STORE/2/obj/007c2b2500000001
+STORE/2/obj/007c2b2500000002
+STORE/2/obj/007c2b2500000003
+STORE/2/obj/007c2b2500000004
+STORE/2/obj/007c2b2500000005
+STORE/2/obj/007c2b2500000006
+STORE/2/obj/007c2b2500000007
+STORE/2/obj/807c2b2500000000
+STORE/3/obj/007c2b2500000004
+STORE/3/obj/007c2b2500000005
+STORE/3/obj/007c2b2500000006
+STORE/3/obj/007c2b2500000007
+STORE/4/obj/007c2b2500000001
+STORE/4/obj/007c2b2500000002
+STORE/4/obj/007c2b2500000003
+STORE/4/obj/007c2b2500000004
+STORE/4/obj/007c2b2500000005
+STORE/4/obj/007c2b2500000006
Cluster recovery: disable
Cluster status: running
@@ -156,33 +156,33 @@ Cluster created at DATE
Epoch Time Version
DATE 8 [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, 127.0.0.1:7006, 127.0.0.1:7007]
-/tmp/sheepdog/0/obj/007c2b2500000000
-/tmp/sheepdog/0/obj/007c2b2500000001
-/tmp/sheepdog/0/obj/007c2b2500000002
-/tmp/sheepdog/0/obj/007c2b2500000003
-/tmp/sheepdog/0/obj/007c2b2500000004
-/tmp/sheepdog/0/obj/007c2b2500000005
-/tmp/sheepdog/0/obj/007c2b2500000006
-/tmp/sheepdog/0/obj/007c2b2500000007
-/tmp/sheepdog/0/obj/807c2b2500000000
-/tmp/sheepdog/1/obj/007c2b2500000000
-/tmp/sheepdog/1/obj/007c2b2500000001
-/tmp/sheepdog/1/obj/007c2b2500000002
-/tmp/sheepdog/1/obj/007c2b2500000003
-/tmp/sheepdog/1/obj/007c2b2500000004
-/tmp/sheepdog/1/obj/007c2b2500000005
-/tmp/sheepdog/1/obj/007c2b2500000006
-/tmp/sheepdog/1/obj/007c2b2500000007
-/tmp/sheepdog/1/obj/807c2b2500000000
-/tmp/sheepdog/2/obj/007c2b2500000000
-/tmp/sheepdog/2/obj/007c2b2500000001
-/tmp/sheepdog/2/obj/007c2b2500000002
-/tmp/sheepdog/2/obj/007c2b2500000003
-/tmp/sheepdog/2/obj/007c2b2500000004
-/tmp/sheepdog/2/obj/007c2b2500000005
-/tmp/sheepdog/2/obj/007c2b2500000006
-/tmp/sheepdog/2/obj/007c2b2500000007
-/tmp/sheepdog/2/obj/807c2b2500000000
+STORE/0/obj/007c2b2500000000
+STORE/0/obj/007c2b2500000001
+STORE/0/obj/007c2b2500000002
+STORE/0/obj/007c2b2500000003
+STORE/0/obj/007c2b2500000004
+STORE/0/obj/007c2b2500000005
+STORE/0/obj/007c2b2500000006
+STORE/0/obj/007c2b2500000007
+STORE/0/obj/807c2b2500000000
+STORE/1/obj/007c2b2500000000
+STORE/1/obj/007c2b2500000001
+STORE/1/obj/007c2b2500000002
+STORE/1/obj/007c2b2500000003
+STORE/1/obj/007c2b2500000004
+STORE/1/obj/007c2b2500000005
+STORE/1/obj/007c2b2500000006
+STORE/1/obj/007c2b2500000007
+STORE/1/obj/807c2b2500000000
+STORE/2/obj/007c2b2500000000
+STORE/2/obj/007c2b2500000001
+STORE/2/obj/007c2b2500000002
+STORE/2/obj/007c2b2500000003
+STORE/2/obj/007c2b2500000004
+STORE/2/obj/007c2b2500000005
+STORE/2/obj/007c2b2500000006
+STORE/2/obj/007c2b2500000007
+STORE/2/obj/807c2b2500000000
e0b27e7466a3c21d0a4dedfed8bb9184 -
f35835c0a25be5ee75a536d1816c1db4 -
0faf5f38c28a38a6db1e6dfcdf259141 -
@@ -193,37 +193,37 @@ Cluster created at DATE
Epoch Time Version
DATE 8 [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, 127.0.0.1:7006, 127.0.0.1:7007]
-/tmp/sheepdog/0/obj/007c2b2500000000
-/tmp/sheepdog/0/obj/007c2b2500000001
-/tmp/sheepdog/0/obj/007c2b2500000002
-/tmp/sheepdog/0/obj/007c2b2500000003
-/tmp/sheepdog/0/obj/007c2b2500000004
-/tmp/sheepdog/0/obj/007c2b2500000005
-/tmp/sheepdog/0/obj/007c2b2500000006
-/tmp/sheepdog/0/obj/007c2b2500000007
-/tmp/sheepdog/0/obj/807c2b2500000000
-/tmp/sheepdog/1/obj/007c2b2500000000
-/tmp/sheepdog/1/obj/007c2b2500000001
-/tmp/sheepdog/1/obj/007c2b2500000002
-/tmp/sheepdog/1/obj/007c2b2500000003
-/tmp/sheepdog/1/obj/007c2b2500000004
-/tmp/sheepdog/1/obj/007c2b2500000005
-/tmp/sheepdog/1/obj/007c2b2500000006
-/tmp/sheepdog/1/obj/007c2b2500000007
-/tmp/sheepdog/1/obj/807c2b2500000000
-/tmp/sheepdog/2/obj/007c2b2500000000
-/tmp/sheepdog/2/obj/007c2b2500000001
-/tmp/sheepdog/2/obj/007c2b2500000002
-/tmp/sheepdog/2/obj/007c2b2500000003
-/tmp/sheepdog/2/obj/007c2b2500000004
-/tmp/sheepdog/2/obj/007c2b2500000005
-/tmp/sheepdog/2/obj/007c2b2500000006
-/tmp/sheepdog/2/obj/007c2b2500000007
-/tmp/sheepdog/2/obj/807c2b2500000000
-/tmp/sheepdog/4/obj/007c2b2500000001
-/tmp/sheepdog/4/obj/007c2b2500000002
-/tmp/sheepdog/6/obj/007c2b2500000003
-/tmp/sheepdog/7/obj/007c2b2500000003
+STORE/0/obj/007c2b2500000000
+STORE/0/obj/007c2b2500000001
+STORE/0/obj/007c2b2500000002
+STORE/0/obj/007c2b2500000003
+STORE/0/obj/007c2b2500000004
+STORE/0/obj/007c2b2500000005
+STORE/0/obj/007c2b2500000006
+STORE/0/obj/007c2b2500000007
+STORE/0/obj/807c2b2500000000
+STORE/1/obj/007c2b2500000000
+STORE/1/obj/007c2b2500000001
+STORE/1/obj/007c2b2500000002
+STORE/1/obj/007c2b2500000003
+STORE/1/obj/007c2b2500000004
+STORE/1/obj/007c2b2500000005
+STORE/1/obj/007c2b2500000006
+STORE/1/obj/007c2b2500000007
+STORE/1/obj/807c2b2500000000
+STORE/2/obj/007c2b2500000000
+STORE/2/obj/007c2b2500000001
+STORE/2/obj/007c2b2500000002
+STORE/2/obj/007c2b2500000003
+STORE/2/obj/007c2b2500000004
+STORE/2/obj/007c2b2500000005
+STORE/2/obj/007c2b2500000006
+STORE/2/obj/007c2b2500000007
+STORE/2/obj/807c2b2500000000
+STORE/4/obj/007c2b2500000001
+STORE/4/obj/007c2b2500000002
+STORE/6/obj/007c2b2500000003
+STORE/7/obj/007c2b2500000003
Cluster recovery: enable
Cluster status: running
@@ -231,30 +231,30 @@ Cluster created at DATE
Epoch Time Version
DATE 8 [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, 127.0.0.1:7006, 127.0.0.1:7007]
-/tmp/sheepdog/0/obj/007c2b2500000000
-/tmp/sheepdog/0/obj/007c2b2500000001
-/tmp/sheepdog/0/obj/007c2b2500000002
-/tmp/sheepdog/0/obj/007c2b2500000004
-/tmp/sheepdog/0/obj/007c2b2500000005
-/tmp/sheepdog/0/obj/807c2b2500000000
-/tmp/sheepdog/1/obj/007c2b2500000000
-/tmp/sheepdog/1/obj/007c2b2500000001
-/tmp/sheepdog/1/obj/007c2b2500000002
-/tmp/sheepdog/1/obj/807c2b2500000000
-/tmp/sheepdog/2/obj/007c2b2500000000
-/tmp/sheepdog/2/obj/007c2b2500000003
-/tmp/sheepdog/2/obj/807c2b2500000000
-/tmp/sheepdog/3/obj/007c2b2500000004
-/tmp/sheepdog/3/obj/007c2b2500000005
-/tmp/sheepdog/3/obj/007c2b2500000007
-/tmp/sheepdog/4/obj/007c2b2500000001
-/tmp/sheepdog/4/obj/007c2b2500000002
-/tmp/sheepdog/4/obj/007c2b2500000004
-/tmp/sheepdog/4/obj/007c2b2500000006
-/tmp/sheepdog/5/obj/007c2b2500000005
-/tmp/sheepdog/5/obj/007c2b2500000006
-/tmp/sheepdog/5/obj/007c2b2500000007
-/tmp/sheepdog/6/obj/007c2b2500000003
-/tmp/sheepdog/7/obj/007c2b2500000003
-/tmp/sheepdog/7/obj/007c2b2500000006
-/tmp/sheepdog/7/obj/007c2b2500000007
+STORE/0/obj/007c2b2500000000
+STORE/0/obj/007c2b2500000001
+STORE/0/obj/007c2b2500000002
+STORE/0/obj/007c2b2500000004
+STORE/0/obj/007c2b2500000005
+STORE/0/obj/807c2b2500000000
+STORE/1/obj/007c2b2500000000
+STORE/1/obj/007c2b2500000001
+STORE/1/obj/007c2b2500000002
+STORE/1/obj/807c2b2500000000
+STORE/2/obj/007c2b2500000000
+STORE/2/obj/007c2b2500000003
+STORE/2/obj/807c2b2500000000
+STORE/3/obj/007c2b2500000004
+STORE/3/obj/007c2b2500000005
+STORE/3/obj/007c2b2500000007
+STORE/4/obj/007c2b2500000001
+STORE/4/obj/007c2b2500000002
+STORE/4/obj/007c2b2500000004
+STORE/4/obj/007c2b2500000006
+STORE/5/obj/007c2b2500000005
+STORE/5/obj/007c2b2500000006
+STORE/5/obj/007c2b2500000007
+STORE/6/obj/007c2b2500000003
+STORE/7/obj/007c2b2500000003
+STORE/7/obj/007c2b2500000006
+STORE/7/obj/007c2b2500000007
diff --git a/tests/020 b/tests/020
index a5fccf8..6fe2e32 100755
--- a/tests/020
+++ b/tests/020
@@ -28,7 +28,7 @@ $COLLIE vdi create test 40M
dd if=/dev/urandom | $COLLIE vdi write test
# check cache size, should be 20 * 80%
-nr=`ls /tmp/sheepdog/0/cache/7c2b25 | wc -l`
+nr=`ls $STORE/0/cache/7c2b25 | wc -l`
if [ $nr -gt 4 ]; then
echo "reclaim failed"
fi
diff --git a/tests/027 b/tests/027
index a014fd0..05f4ab9 100755
--- a/tests/027
+++ b/tests/027
@@ -30,4 +30,4 @@ _kill_sheep 3
_wait_for_sheep_recovery 0
-find $STORE -name '80fd32fc00000000' | sort
+find $STORE -name '80fd32fc00000000' | _filter_store | sort
diff --git a/tests/027.out b/tests/027.out
index 594db32..b40d391 100644
--- a/tests/027.out
+++ b/tests/027.out
@@ -1,5 +1,5 @@
QA output created by 027
using backend farm store
-/tmp/sheepdog/0/obj/80fd32fc00000000
-/tmp/sheepdog/1/obj/80fd32fc00000000
-/tmp/sheepdog/3/obj/80fd32fc00000000
+STORE/0/obj/80fd32fc00000000
+STORE/1/obj/80fd32fc00000000
+STORE/3/obj/80fd32fc00000000
diff --git a/tests/032 b/tests/032
index 259e798..7887a1c 100755
--- a/tests/032
+++ b/tests/032
@@ -47,10 +47,10 @@ done
_wait_for_sheep_recovery 0
-ls $STORE/*/obj/807c2b2500000000 | sort
+ls $STORE/*/obj/807c2b2500000000 | _filter_store | sort
for i in `seq 0 24`; do
- ls $STORE/*/obj/007c2b25000000`printf "%02x" $i` | sort
+ ls $STORE/*/obj/007c2b25000000`printf "%02x" $i` | _filter_store | sort
done
-ls $STORE/*/obj/.stale | sort
+ls $STORE/*/obj/.stale | _filter_store | sort
$COLLIE vdi read test | md5sum
diff --git a/tests/032.out b/tests/032.out
index ea91f6d..6dbf578 100644
--- a/tests/032.out
+++ b/tests/032.out
@@ -1,84 +1,84 @@
QA output created by 032
using backend farm store
9c7766570b3be3aff2724f587c2f4107 -
-/tmp/sheepdog/0/obj/807c2b2500000000
-/tmp/sheepdog/1/obj/807c2b2500000000
-/tmp/sheepdog/2/obj/807c2b2500000000
-/tmp/sheepdog/0/obj/007c2b2500000000
-/tmp/sheepdog/1/obj/007c2b2500000000
-/tmp/sheepdog/2/obj/007c2b2500000000
-/tmp/sheepdog/0/obj/007c2b2500000001
-/tmp/sheepdog/1/obj/007c2b2500000001
-/tmp/sheepdog/4/obj/007c2b2500000001
-/tmp/sheepdog/0/obj/007c2b2500000002
-/tmp/sheepdog/1/obj/007c2b2500000002
-/tmp/sheepdog/4/obj/007c2b2500000002
-/tmp/sheepdog/2/obj/007c2b2500000003
-/tmp/sheepdog/6/obj/007c2b2500000003
-/tmp/sheepdog/7/obj/007c2b2500000003
-/tmp/sheepdog/0/obj/007c2b2500000004
-/tmp/sheepdog/3/obj/007c2b2500000004
-/tmp/sheepdog/4/obj/007c2b2500000004
-/tmp/sheepdog/0/obj/007c2b2500000005
-/tmp/sheepdog/3/obj/007c2b2500000005
-/tmp/sheepdog/5/obj/007c2b2500000005
-/tmp/sheepdog/4/obj/007c2b2500000006
-/tmp/sheepdog/5/obj/007c2b2500000006
-/tmp/sheepdog/7/obj/007c2b2500000006
-/tmp/sheepdog/3/obj/007c2b2500000007
-/tmp/sheepdog/5/obj/007c2b2500000007
-/tmp/sheepdog/7/obj/007c2b2500000007
-/tmp/sheepdog/1/obj/007c2b2500000008
-/tmp/sheepdog/3/obj/007c2b2500000008
-/tmp/sheepdog/6/obj/007c2b2500000008
-/tmp/sheepdog/3/obj/007c2b2500000009
-/tmp/sheepdog/5/obj/007c2b2500000009
-/tmp/sheepdog/7/obj/007c2b2500000009
-/tmp/sheepdog/0/obj/007c2b250000000a
-/tmp/sheepdog/2/obj/007c2b250000000a
-/tmp/sheepdog/5/obj/007c2b250000000a
-/tmp/sheepdog/1/obj/007c2b250000000b
-/tmp/sheepdog/4/obj/007c2b250000000b
-/tmp/sheepdog/5/obj/007c2b250000000b
-/tmp/sheepdog/3/obj/007c2b250000000c
-/tmp/sheepdog/4/obj/007c2b250000000c
-/tmp/sheepdog/5/obj/007c2b250000000c
-/tmp/sheepdog/0/obj/007c2b250000000d
-/tmp/sheepdog/2/obj/007c2b250000000d
-/tmp/sheepdog/3/obj/007c2b250000000d
-/tmp/sheepdog/1/obj/007c2b250000000e
-/tmp/sheepdog/3/obj/007c2b250000000e
-/tmp/sheepdog/7/obj/007c2b250000000e
-/tmp/sheepdog/2/obj/007c2b250000000f
-/tmp/sheepdog/4/obj/007c2b250000000f
-/tmp/sheepdog/5/obj/007c2b250000000f
-/tmp/sheepdog/0/obj/007c2b2500000010
-/tmp/sheepdog/1/obj/007c2b2500000010
-/tmp/sheepdog/4/obj/007c2b2500000010
-/tmp/sheepdog/3/obj/007c2b2500000011
-/tmp/sheepdog/5/obj/007c2b2500000011
-/tmp/sheepdog/7/obj/007c2b2500000011
-/tmp/sheepdog/2/obj/007c2b2500000012
-/tmp/sheepdog/4/obj/007c2b2500000012
-/tmp/sheepdog/6/obj/007c2b2500000012
-/tmp/sheepdog/0/obj/007c2b2500000013
-/tmp/sheepdog/5/obj/007c2b2500000013
-/tmp/sheepdog/6/obj/007c2b2500000013
-/tmp/sheepdog/0/obj/007c2b2500000014
-/tmp/sheepdog/5/obj/007c2b2500000014
-/tmp/sheepdog/6/obj/007c2b2500000014
-/tmp/sheepdog/0/obj/007c2b2500000015
-/tmp/sheepdog/2/obj/007c2b2500000015
-/tmp/sheepdog/3/obj/007c2b2500000015
-/tmp/sheepdog/1/obj/007c2b2500000016
-/tmp/sheepdog/5/obj/007c2b2500000016
-/tmp/sheepdog/6/obj/007c2b2500000016
-/tmp/sheepdog/2/obj/007c2b2500000017
-/tmp/sheepdog/5/obj/007c2b2500000017
-/tmp/sheepdog/6/obj/007c2b2500000017
-/tmp/sheepdog/0/obj/007c2b2500000018
-/tmp/sheepdog/1/obj/007c2b2500000018
-/tmp/sheepdog/5/obj/007c2b2500000018
+STORE/0/obj/807c2b2500000000
+STORE/1/obj/807c2b2500000000
+STORE/2/obj/807c2b2500000000
+STORE/0/obj/007c2b2500000000
+STORE/1/obj/007c2b2500000000
+STORE/2/obj/007c2b2500000000
+STORE/0/obj/007c2b2500000001
+STORE/1/obj/007c2b2500000001
+STORE/4/obj/007c2b2500000001
+STORE/0/obj/007c2b2500000002
+STORE/1/obj/007c2b2500000002
+STORE/4/obj/007c2b2500000002
+STORE/2/obj/007c2b2500000003
+STORE/6/obj/007c2b2500000003
+STORE/7/obj/007c2b2500000003
+STORE/0/obj/007c2b2500000004
+STORE/3/obj/007c2b2500000004
+STORE/4/obj/007c2b2500000004
+STORE/0/obj/007c2b2500000005
+STORE/3/obj/007c2b2500000005
+STORE/5/obj/007c2b2500000005
+STORE/4/obj/007c2b2500000006
+STORE/5/obj/007c2b2500000006
+STORE/7/obj/007c2b2500000006
+STORE/3/obj/007c2b2500000007
+STORE/5/obj/007c2b2500000007
+STORE/7/obj/007c2b2500000007
+STORE/1/obj/007c2b2500000008
+STORE/3/obj/007c2b2500000008
+STORE/6/obj/007c2b2500000008
+STORE/3/obj/007c2b2500000009
+STORE/5/obj/007c2b2500000009
+STORE/7/obj/007c2b2500000009
+STORE/0/obj/007c2b250000000a
+STORE/2/obj/007c2b250000000a
+STORE/5/obj/007c2b250000000a
+STORE/1/obj/007c2b250000000b
+STORE/4/obj/007c2b250000000b
+STORE/5/obj/007c2b250000000b
+STORE/3/obj/007c2b250000000c
+STORE/4/obj/007c2b250000000c
+STORE/5/obj/007c2b250000000c
+STORE/0/obj/007c2b250000000d
+STORE/2/obj/007c2b250000000d
+STORE/3/obj/007c2b250000000d
+STORE/1/obj/007c2b250000000e
+STORE/3/obj/007c2b250000000e
+STORE/7/obj/007c2b250000000e
+STORE/2/obj/007c2b250000000f
+STORE/4/obj/007c2b250000000f
+STORE/5/obj/007c2b250000000f
+STORE/0/obj/007c2b2500000010
+STORE/1/obj/007c2b2500000010
+STORE/4/obj/007c2b2500000010
+STORE/3/obj/007c2b2500000011
+STORE/5/obj/007c2b2500000011
+STORE/7/obj/007c2b2500000011
+STORE/2/obj/007c2b2500000012
+STORE/4/obj/007c2b2500000012
+STORE/6/obj/007c2b2500000012
+STORE/0/obj/007c2b2500000013
+STORE/5/obj/007c2b2500000013
+STORE/6/obj/007c2b2500000013
+STORE/0/obj/007c2b2500000014
+STORE/5/obj/007c2b2500000014
+STORE/6/obj/007c2b2500000014
+STORE/0/obj/007c2b2500000015
+STORE/2/obj/007c2b2500000015
+STORE/3/obj/007c2b2500000015
+STORE/1/obj/007c2b2500000016
+STORE/5/obj/007c2b2500000016
+STORE/6/obj/007c2b2500000016
+STORE/2/obj/007c2b2500000017
+STORE/5/obj/007c2b2500000017
+STORE/6/obj/007c2b2500000017
+STORE/0/obj/007c2b2500000018
+STORE/1/obj/007c2b2500000018
+STORE/5/obj/007c2b2500000018
@@ -86,12 +86,12 @@ using backend farm store
-/tmp/sheepdog/0/obj/.stale:
-/tmp/sheepdog/1/obj/.stale:
-/tmp/sheepdog/2/obj/.stale:
-/tmp/sheepdog/3/obj/.stale:
-/tmp/sheepdog/4/obj/.stale:
-/tmp/sheepdog/5/obj/.stale:
-/tmp/sheepdog/6/obj/.stale:
-/tmp/sheepdog/7/obj/.stale:
+STORE/0/obj/.stale:
+STORE/1/obj/.stale:
+STORE/2/obj/.stale:
+STORE/3/obj/.stale:
+STORE/4/obj/.stale:
+STORE/5/obj/.stale:
+STORE/6/obj/.stale:
+STORE/7/obj/.stale:
9c7766570b3be3aff2724f587c2f4107 -
diff --git a/tests/033 b/tests/033
index 40b9734..28a5da6 100755
--- a/tests/033
+++ b/tests/033
@@ -56,10 +56,10 @@ done
_wait_for_sheep_recovery 0
-ls $STORE/*/obj/807c2b2500000000 | sort
+ls $STORE/*/obj/807c2b2500000000 | _filter_store | sort
for i in `seq 0 24`; do
- ls $STORE/*/obj/007c2b25000000`printf "%02x" $i` | sort
+ ls $STORE/*/obj/007c2b25000000`printf "%02x" $i` | _filter_store | sort
done
-ls $STORE/*/obj/.stale | sort
+ls $STORE/*/obj/.stale | _filter_store | sort
$COLLIE vdi read test | md5sum
diff --git a/tests/033.out b/tests/033.out
index e9fa303..640c26e 100644
--- a/tests/033.out
+++ b/tests/033.out
@@ -1,84 +1,84 @@
QA output created by 033
using backend farm store
9c7766570b3be3aff2724f587c2f4107 -
-/tmp/sheepdog/0/obj/807c2b2500000000
-/tmp/sheepdog/1/obj/807c2b2500000000
-/tmp/sheepdog/2/obj/807c2b2500000000
-/tmp/sheepdog/0/obj/007c2b2500000000
-/tmp/sheepdog/1/obj/007c2b2500000000
-/tmp/sheepdog/2/obj/007c2b2500000000
-/tmp/sheepdog/0/obj/007c2b2500000001
-/tmp/sheepdog/1/obj/007c2b2500000001
-/tmp/sheepdog/4/obj/007c2b2500000001
-/tmp/sheepdog/0/obj/007c2b2500000002
-/tmp/sheepdog/1/obj/007c2b2500000002
-/tmp/sheepdog/4/obj/007c2b2500000002
-/tmp/sheepdog/2/obj/007c2b2500000003
-/tmp/sheepdog/6/obj/007c2b2500000003
-/tmp/sheepdog/7/obj/007c2b2500000003
-/tmp/sheepdog/0/obj/007c2b2500000004
-/tmp/sheepdog/3/obj/007c2b2500000004
-/tmp/sheepdog/4/obj/007c2b2500000004
-/tmp/sheepdog/0/obj/007c2b2500000005
-/tmp/sheepdog/3/obj/007c2b2500000005
-/tmp/sheepdog/5/obj/007c2b2500000005
-/tmp/sheepdog/4/obj/007c2b2500000006
-/tmp/sheepdog/5/obj/007c2b2500000006
-/tmp/sheepdog/7/obj/007c2b2500000006
-/tmp/sheepdog/3/obj/007c2b2500000007
-/tmp/sheepdog/5/obj/007c2b2500000007
-/tmp/sheepdog/7/obj/007c2b2500000007
-/tmp/sheepdog/1/obj/007c2b2500000008
-/tmp/sheepdog/3/obj/007c2b2500000008
-/tmp/sheepdog/6/obj/007c2b2500000008
-/tmp/sheepdog/3/obj/007c2b2500000009
-/tmp/sheepdog/5/obj/007c2b2500000009
-/tmp/sheepdog/7/obj/007c2b2500000009
-/tmp/sheepdog/0/obj/007c2b250000000a
-/tmp/sheepdog/2/obj/007c2b250000000a
-/tmp/sheepdog/5/obj/007c2b250000000a
-/tmp/sheepdog/1/obj/007c2b250000000b
-/tmp/sheepdog/4/obj/007c2b250000000b
-/tmp/sheepdog/5/obj/007c2b250000000b
-/tmp/sheepdog/3/obj/007c2b250000000c
-/tmp/sheepdog/4/obj/007c2b250000000c
-/tmp/sheepdog/5/obj/007c2b250000000c
-/tmp/sheepdog/0/obj/007c2b250000000d
-/tmp/sheepdog/2/obj/007c2b250000000d
-/tmp/sheepdog/3/obj/007c2b250000000d
-/tmp/sheepdog/1/obj/007c2b250000000e
-/tmp/sheepdog/3/obj/007c2b250000000e
-/tmp/sheepdog/7/obj/007c2b250000000e
-/tmp/sheepdog/2/obj/007c2b250000000f
-/tmp/sheepdog/4/obj/007c2b250000000f
-/tmp/sheepdog/5/obj/007c2b250000000f
-/tmp/sheepdog/0/obj/007c2b2500000010
-/tmp/sheepdog/1/obj/007c2b2500000010
-/tmp/sheepdog/4/obj/007c2b2500000010
-/tmp/sheepdog/3/obj/007c2b2500000011
-/tmp/sheepdog/5/obj/007c2b2500000011
-/tmp/sheepdog/7/obj/007c2b2500000011
-/tmp/sheepdog/2/obj/007c2b2500000012
-/tmp/sheepdog/4/obj/007c2b2500000012
-/tmp/sheepdog/6/obj/007c2b2500000012
-/tmp/sheepdog/0/obj/007c2b2500000013
-/tmp/sheepdog/5/obj/007c2b2500000013
-/tmp/sheepdog/6/obj/007c2b2500000013
-/tmp/sheepdog/0/obj/007c2b2500000014
-/tmp/sheepdog/5/obj/007c2b2500000014
-/tmp/sheepdog/6/obj/007c2b2500000014
-/tmp/sheepdog/0/obj/007c2b2500000015
-/tmp/sheepdog/2/obj/007c2b2500000015
-/tmp/sheepdog/3/obj/007c2b2500000015
-/tmp/sheepdog/1/obj/007c2b2500000016
-/tmp/sheepdog/5/obj/007c2b2500000016
-/tmp/sheepdog/6/obj/007c2b2500000016
-/tmp/sheepdog/2/obj/007c2b2500000017
-/tmp/sheepdog/5/obj/007c2b2500000017
-/tmp/sheepdog/6/obj/007c2b2500000017
-/tmp/sheepdog/0/obj/007c2b2500000018
-/tmp/sheepdog/1/obj/007c2b2500000018
-/tmp/sheepdog/5/obj/007c2b2500000018
+STORE/0/obj/807c2b2500000000
+STORE/1/obj/807c2b2500000000
+STORE/2/obj/807c2b2500000000
+STORE/0/obj/007c2b2500000000
+STORE/1/obj/007c2b2500000000
+STORE/2/obj/007c2b2500000000
+STORE/0/obj/007c2b2500000001
+STORE/1/obj/007c2b2500000001
+STORE/4/obj/007c2b2500000001
+STORE/0/obj/007c2b2500000002
+STORE/1/obj/007c2b2500000002
+STORE/4/obj/007c2b2500000002
+STORE/2/obj/007c2b2500000003
+STORE/6/obj/007c2b2500000003
+STORE/7/obj/007c2b2500000003
+STORE/0/obj/007c2b2500000004
+STORE/3/obj/007c2b2500000004
+STORE/4/obj/007c2b2500000004
+STORE/0/obj/007c2b2500000005
+STORE/3/obj/007c2b2500000005
+STORE/5/obj/007c2b2500000005
+STORE/4/obj/007c2b2500000006
+STORE/5/obj/007c2b2500000006
+STORE/7/obj/007c2b2500000006
+STORE/3/obj/007c2b2500000007
+STORE/5/obj/007c2b2500000007
+STORE/7/obj/007c2b2500000007
+STORE/1/obj/007c2b2500000008
+STORE/3/obj/007c2b2500000008
+STORE/6/obj/007c2b2500000008
+STORE/3/obj/007c2b2500000009
+STORE/5/obj/007c2b2500000009
+STORE/7/obj/007c2b2500000009
+STORE/0/obj/007c2b250000000a
+STORE/2/obj/007c2b250000000a
+STORE/5/obj/007c2b250000000a
+STORE/1/obj/007c2b250000000b
+STORE/4/obj/007c2b250000000b
+STORE/5/obj/007c2b250000000b
+STORE/3/obj/007c2b250000000c
+STORE/4/obj/007c2b250000000c
+STORE/5/obj/007c2b250000000c
+STORE/0/obj/007c2b250000000d
+STORE/2/obj/007c2b250000000d
+STORE/3/obj/007c2b250000000d
+STORE/1/obj/007c2b250000000e
+STORE/3/obj/007c2b250000000e
+STORE/7/obj/007c2b250000000e
+STORE/2/obj/007c2b250000000f
+STORE/4/obj/007c2b250000000f
+STORE/5/obj/007c2b250000000f
+STORE/0/obj/007c2b2500000010
+STORE/1/obj/007c2b2500000010
+STORE/4/obj/007c2b2500000010
+STORE/3/obj/007c2b2500000011
+STORE/5/obj/007c2b2500000011
+STORE/7/obj/007c2b2500000011
+STORE/2/obj/007c2b2500000012
+STORE/4/obj/007c2b2500000012
+STORE/6/obj/007c2b2500000012
+STORE/0/obj/007c2b2500000013
+STORE/5/obj/007c2b2500000013
+STORE/6/obj/007c2b2500000013
+STORE/0/obj/007c2b2500000014
+STORE/5/obj/007c2b2500000014
+STORE/6/obj/007c2b2500000014
+STORE/0/obj/007c2b2500000015
+STORE/2/obj/007c2b2500000015
+STORE/3/obj/007c2b2500000015
+STORE/1/obj/007c2b2500000016
+STORE/5/obj/007c2b2500000016
+STORE/6/obj/007c2b2500000016
+STORE/2/obj/007c2b2500000017
+STORE/5/obj/007c2b2500000017
+STORE/6/obj/007c2b2500000017
+STORE/0/obj/007c2b2500000018
+STORE/1/obj/007c2b2500000018
+STORE/5/obj/007c2b2500000018
@@ -86,12 +86,12 @@ using backend farm store
-/tmp/sheepdog/0/obj/.stale:
-/tmp/sheepdog/1/obj/.stale:
-/tmp/sheepdog/2/obj/.stale:
-/tmp/sheepdog/3/obj/.stale:
-/tmp/sheepdog/4/obj/.stale:
-/tmp/sheepdog/5/obj/.stale:
-/tmp/sheepdog/6/obj/.stale:
-/tmp/sheepdog/7/obj/.stale:
+STORE/0/obj/.stale:
+STORE/1/obj/.stale:
+STORE/2/obj/.stale:
+STORE/3/obj/.stale:
+STORE/4/obj/.stale:
+STORE/5/obj/.stale:
+STORE/6/obj/.stale:
+STORE/7/obj/.stale:
9c7766570b3be3aff2724f587c2f4107 -
diff --git a/tests/042 b/tests/042
index 9290ab6..576bf9e 100755
--- a/tests/042
+++ b/tests/042
@@ -57,4 +57,4 @@ for i in `seq 0 3`; do
$COLLIE node info -p 700$i
$COLLIE node list -p 700$i
done
-ls $STORE/*/obj/* | sort
+ls $STORE/*/obj/* | _filter_store | sort
diff --git a/tests/042.out b/tests/042.out
index f20ef5c..5f9d81d 100644
--- a/tests/042.out
+++ b/tests/042.out
@@ -98,49 +98,49 @@ M Id Host:Port V-Nodes Zone
- 1 127.0.0.1:7001 64 1
- 2 127.0.0.1:7002 64 2
- 3 127.0.0.1:7003 64 3
-/tmp/sheepdog/0/obj/00fd32fc00000000
-/tmp/sheepdog/0/obj/00fd32fc00000001
-/tmp/sheepdog/0/obj/00fd32fc00000002
-/tmp/sheepdog/0/obj/00fd32fc00000003
-/tmp/sheepdog/0/obj/00fd32fc00000004
-/tmp/sheepdog/0/obj/00fd32fc00000005
-/tmp/sheepdog/0/obj/00fd32fc00000006
-/tmp/sheepdog/0/obj/00fd32fc00000007
-/tmp/sheepdog/0/obj/00fd32fc00000008
-/tmp/sheepdog/0/obj/00fd32fc00000009
-/tmp/sheepdog/0/obj/00fd32fc0000000a
-/tmp/sheepdog/0/obj/00fd34af00000000
-/tmp/sheepdog/0/obj/00fd34af00000001
-/tmp/sheepdog/0/obj/00fd34af00000002
-/tmp/sheepdog/0/obj/00fd34af00000003
-/tmp/sheepdog/0/obj/00fd34af00000004
-/tmp/sheepdog/0/obj/00fd34af00000005
-/tmp/sheepdog/0/obj/00fd34af00000006
-/tmp/sheepdog/0/obj/00fd34af00000007
-/tmp/sheepdog/0/obj/00fd34af00000008
-/tmp/sheepdog/0/obj/00fd34af0000000a
-/tmp/sheepdog/0/obj/80fd32fc00000000
-/tmp/sheepdog/0/obj/80fd34af00000000
-/tmp/sheepdog/0/obj/80fd381500000000
-/tmp/sheepdog/1/obj/00fd32fc00000000
-/tmp/sheepdog/1/obj/00fd32fc00000001
-/tmp/sheepdog/1/obj/00fd32fc00000002
-/tmp/sheepdog/1/obj/00fd32fc00000003
-/tmp/sheepdog/1/obj/00fd32fc00000005
-/tmp/sheepdog/1/obj/00fd32fc00000006
-/tmp/sheepdog/1/obj/00fd32fc00000007
-/tmp/sheepdog/1/obj/00fd32fc00000008
-/tmp/sheepdog/1/obj/00fd34af00000000
-/tmp/sheepdog/1/obj/00fd34af00000001
-/tmp/sheepdog/1/obj/00fd34af00000002
-/tmp/sheepdog/1/obj/00fd34af00000003
-/tmp/sheepdog/1/obj/00fd34af00000004
-/tmp/sheepdog/1/obj/00fd34af00000006
-/tmp/sheepdog/1/obj/00fd34af00000009
-/tmp/sheepdog/1/obj/00fd34af0000000a
-/tmp/sheepdog/1/obj/80fd32fc00000000
-/tmp/sheepdog/1/obj/80fd34af00000000
-/tmp/sheepdog/1/obj/80fd366200000000
-/tmp/sheepdog/1/obj/80fd381500000000
-/tmp/sheepdog/3/obj/80fd32fc00000000
-/tmp/sheepdog/3/obj/80fd34af00000000
+STORE/0/obj/00fd32fc00000000
+STORE/0/obj/00fd32fc00000001
+STORE/0/obj/00fd32fc00000002
+STORE/0/obj/00fd32fc00000003
+STORE/0/obj/00fd32fc00000004
+STORE/0/obj/00fd32fc00000005
+STORE/0/obj/00fd32fc00000006
+STORE/0/obj/00fd32fc00000007
+STORE/0/obj/00fd32fc00000008
+STORE/0/obj/00fd32fc00000009
+STORE/0/obj/00fd32fc0000000a
+STORE/0/obj/00fd34af00000000
+STORE/0/obj/00fd34af00000001
+STORE/0/obj/00fd34af00000002
+STORE/0/obj/00fd34af00000003
+STORE/0/obj/00fd34af00000004
+STORE/0/obj/00fd34af00000005
+STORE/0/obj/00fd34af00000006
+STORE/0/obj/00fd34af00000007
+STORE/0/obj/00fd34af00000008
+STORE/0/obj/00fd34af0000000a
+STORE/0/obj/80fd32fc00000000
+STORE/0/obj/80fd34af00000000
+STORE/0/obj/80fd381500000000
+STORE/1/obj/00fd32fc00000000
+STORE/1/obj/00fd32fc00000001
+STORE/1/obj/00fd32fc00000002
+STORE/1/obj/00fd32fc00000003
+STORE/1/obj/00fd32fc00000005
+STORE/1/obj/00fd32fc00000006
+STORE/1/obj/00fd32fc00000007
+STORE/1/obj/00fd32fc00000008
+STORE/1/obj/00fd34af00000000
+STORE/1/obj/00fd34af00000001
+STORE/1/obj/00fd34af00000002
+STORE/1/obj/00fd34af00000003
+STORE/1/obj/00fd34af00000004
+STORE/1/obj/00fd34af00000006
+STORE/1/obj/00fd34af00000009
+STORE/1/obj/00fd34af0000000a
+STORE/1/obj/80fd32fc00000000
+STORE/1/obj/80fd34af00000000
+STORE/1/obj/80fd366200000000
+STORE/1/obj/80fd381500000000
+STORE/3/obj/80fd32fc00000000
+STORE/3/obj/80fd34af00000000
diff --git a/tests/057 b/tests/057
index 94d02af..a9887eb 100755
--- a/tests/057
+++ b/tests/057
@@ -23,26 +23,26 @@ $COLLIE cluster format
sleep 1
$COLLIE vdi create test 100M -P
-$COLLIE node md info | awk '{$2="MASKED";print $0}'
+$COLLIE node md info | awk '{$2="MASKED";print $0}' | _filter_store
# plug during node event
_start_sheep 3
_wait_for_sheep 4
$COLLIE node md plug $STORE/0/d3,$STORE/0/d4
_wait_for_sheep_recovery 0
-$COLLIE node md info | awk '{$2="MASKED";print $0}'
+$COLLIE node md info | awk '{$2="MASKED";print $0}' | _filter_store
$COLLIE vdi check test
$COLLIE cluster info | _filter_cluster_info
# plug duplicate path
$COLLIE node md plug $STORE/0/d3
$COLLIE node recovery
-$COLLIE node md info | awk '{$2="MASKED";print $0}'
+$COLLIE node md info | awk '{$2="MASKED";print $0}' | _filter_store
# unplug
$COLLIE node md unplug $STORE/0/d0,$STORE/0/d1
_wait_for_sheep_recovery 0
-$COLLIE node md info | awk '{$2="MASKED";print $0}'
+$COLLIE node md info | awk '{$2="MASKED";print $0}' | _filter_store
$COLLIE vdi check test
$COLLIE cluster info | _filter_cluster_info
@@ -50,8 +50,8 @@ $COLLIE cluster info | _filter_cluster_info
# unplug invalid path
$COLLIE node md unplug $STORE/0/d0
$COLLIE node recovery
-$COLLIE node md info | awk '{$2="MASKED";print $0}'
+$COLLIE node md info | awk '{$2="MASKED";print $0}' | _filter_store
$COLLIE cluster info | _filter_cluster_info
# check stale object purging
-find $STORE/*/d*/.stale/ -type f
+find $STORE/*/d*/.stale/ -type f | _filter_store
diff --git a/tests/057.out b/tests/057.out
index ec3e7c1..ab9e593 100644
--- a/tests/057.out
+++ b/tests/057.out
@@ -1,15 +1,15 @@
QA output created by 057
using backend farm store
Id MASKED Use Path
-0 MASKED GB 48 MB /tmp/sheepdog/0/d0
-1 MASKED GB 24 MB /tmp/sheepdog/0/d1
-2 MASKED GB 32 MB /tmp/sheepdog/0/d2
+0 MASKED GB 48 MB STORE/0/d0
+1 MASKED GB 24 MB STORE/0/d1
+2 MASKED GB 32 MB STORE/0/d2
Id MASKED Use Path
-0 MASKED GB 16 MB /tmp/sheepdog/0/d0
-1 MASKED GB 12 MB /tmp/sheepdog/0/d1
-2 MASKED GB 32 MB /tmp/sheepdog/0/d2
-3 MASKED GB 8.0 MB /tmp/sheepdog/0/d3
-4 MASKED GB 28 MB /tmp/sheepdog/0/d4
+0 MASKED GB 16 MB STORE/0/d0
+1 MASKED GB 12 MB STORE/0/d1
+2 MASKED GB 32 MB STORE/0/d2
+3 MASKED GB 8.0 MB STORE/0/d3
+4 MASKED GB 28 MB STORE/0/d4
finish check&repair test
Cluster status: running
@@ -22,15 +22,15 @@ Failed to execute request, look for sheep.log for more
information
Nodes In Recovery:
Id Host:Port V-Nodes Zone
Id MASKED Use Path
-0 MASKED GB 16 MB /tmp/sheepdog/0/d0
-1 MASKED GB 12 MB /tmp/sheepdog/0/d1
-2 MASKED GB 32 MB /tmp/sheepdog/0/d2
-3 MASKED GB 8.0 MB /tmp/sheepdog/0/d3
-4 MASKED GB 28 MB /tmp/sheepdog/0/d4
+0 MASKED GB 16 MB STORE/0/d0
+1 MASKED GB 12 MB STORE/0/d1
+2 MASKED GB 32 MB STORE/0/d2
+3 MASKED GB 8.0 MB STORE/0/d3
+4 MASKED GB 28 MB STORE/0/d4
Id MASKED Use Path
-0 MASKED GB 32 MB /tmp/sheepdog/0/d2
-1 MASKED GB 24 MB /tmp/sheepdog/0/d3
-2 MASKED GB 40 MB /tmp/sheepdog/0/d4
+0 MASKED GB 32 MB STORE/0/d2
+1 MASKED GB 24 MB STORE/0/d3
+2 MASKED GB 40 MB STORE/0/d4
finish check&repair test
Cluster status: running
@@ -43,9 +43,9 @@ Failed to execute request, look for sheep.log for more
information
Nodes In Recovery:
Id Host:Port V-Nodes Zone
Id MASKED Use Path
-0 MASKED GB 32 MB /tmp/sheepdog/0/d2
-1 MASKED GB 24 MB /tmp/sheepdog/0/d3
-2 MASKED GB 40 MB /tmp/sheepdog/0/d4
+0 MASKED GB 32 MB STORE/0/d2
+1 MASKED GB 24 MB STORE/0/d3
+2 MASKED GB 40 MB STORE/0/d4
Cluster status: running
Cluster created at DATE
diff --git a/tests/common.filter b/tests/common.filter
index bddb7af..dc8c6d4 100644
--- a/tests/common.filter
+++ b/tests/common.filter
@@ -157,5 +157,11 @@ _filter_qemu_io()
sed -e "s/[0-9]* ops\; [0-9/:. sec]* ([0-9/.inf]* [EPTGMKiBbytes]*\/sec
and [0-9/.inf]* ops\/sec)/X ops\; XX:XX:XX.X (XXX YYY\/sec and XXX ops\/sec)/"
}
+# normalize store directory name
+_filter_store()
+{
+ sed -e "s|$STORE|STORE|g"
+}
+
# make sure this script returns success
/bin/true
--
1.8.1.3.566.gaa39828
--
sheepdog mailing list
sheepdog@lists.wpkg.org
http://lists.wpkg.org/mailman/listinfo/sheepdog
