[sheepdog] [PATCH] test: add -y 127.0.0.1 to match up the output

Liu Yuan namei.unix at gmail.com
Fri Aug 17 08:50:11 CEST 2012 

From: Liu Yuan <tailai.ly at taobao.com>

This is required for corosync driver

Signed-off-by: Liu Yuan <tailai.ly at taobao.com>
---
 tests/001 |    8 ++++----
 tests/002 |    6 +++---
 tests/003 |    6 +++---
 tests/004 |    8 ++++----
 tests/005 |    8 ++++----
 tests/006 |    4 ++--
 tests/007 |    8 ++++----
 tests/008 |    4 ++--
 tests/009 |    4 ++--
 tests/010 |    6 +++---
 tests/011 |    2 +-
 tests/012 |    4 ++--
 tests/013 |    2 +-
 tests/014 |    2 +-
 tests/015 |    2 +-
 tests/016 |    2 +-
 tests/017 |    2 +-
 tests/018 |    2 +-
 tests/019 |    2 +-
 tests/020 |    2 +-
 tests/021 |    4 ++--
 21 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/tests/001 b/tests/001
index 1a5749e..501fa54 100755
--- a/tests/001
+++ b/tests/001
@@ -14,7 +14,7 @@ status=1        # failure is the default!
 _cleanup
 
 for i in 0 1; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
@@ -26,7 +26,7 @@ pkill -f "sheep $STORE/0"
 sleep 1
 
 # start another sheep
-$SHEEP $STORE/2 -z 2 -p 7002 -c $DRIVER
+$SHEEP $STORE/2 -z 2 -p 7002 -c $DRIVER -y 127.0.0.1
 sleep 1
 
 # kill all sheeps
@@ -36,7 +36,7 @@ for i in 1 2; do
 done
 
 for i in 0 1 2; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
@@ -45,7 +45,7 @@ $COLLIE cluster info -p 7002 | _filter_cluster_info
 
 # add the other nodes
 for i in 0 1; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
diff --git a/tests/002 b/tests/002
index 4fe52dd..13070e1 100755
--- a/tests/002
+++ b/tests/002
@@ -14,7 +14,7 @@ status=1        # failure is the default!
 _cleanup
 
 for i in 0 1 2; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
@@ -29,7 +29,7 @@ done
 
 # master transfer will happen once
 for i in 1 0 2; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
@@ -38,7 +38,7 @@ $COLLIE cluster info -p 7002 | _filter_cluster_info
 
 # add the other nodes
 for i in 0 1; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
diff --git a/tests/003 b/tests/003
index a1b9027..ee6934a 100755
--- a/tests/003
+++ b/tests/003
@@ -14,7 +14,7 @@ status=1        # failure is the default!
 _cleanup
 
 for i in 0 1 2; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
@@ -29,7 +29,7 @@ done
 
 # master transfer will happen twice
 for i in 0 1 2; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
@@ -38,7 +38,7 @@ $COLLIE cluster info -p 7002 | _filter_cluster_info
 
 # add the other nodes
 for i in 0 1; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
diff --git a/tests/004 b/tests/004
index 0e1ee47..9d52b5a 100755
--- a/tests/004
+++ b/tests/004
@@ -14,7 +14,7 @@ status=1        # failure is the default!
 _cleanup
 
 for i in 0 1; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
@@ -26,7 +26,7 @@ for i in 2 3 4; do
     pkill -f "sheep $STORE/$((i - 2))"
     sleep 1
 
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
@@ -37,7 +37,7 @@ for i in 3 4; do
 done
 
 for i in 0 1 2 3 4; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
@@ -46,7 +46,7 @@ $COLLIE cluster info -p 7004 | _filter_cluster_info
 
 # add the other nodes
 for i in 0 1 2 3; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
diff --git a/tests/005 b/tests/005
index c448a0a..1293933 100755
--- a/tests/005
+++ b/tests/005
@@ -14,7 +14,7 @@ status=1        # failure is the default!
 _cleanup
 
 for i in 0 1; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
@@ -25,7 +25,7 @@ sleep 1
 for i in 2 3 4; do
     pkill -f "sheep $STORE/$((i - 2))"
     sleep 1
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
@@ -33,7 +33,7 @@ $COLLIE cluster shutdown -p 7004
 sleep 1
 
 for i in 0 1 2 3 4; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
@@ -44,7 +44,7 @@ done
 
 # add the other nodes
 for i in 0 1 2; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
     sleep 1
 done
 
diff --git a/tests/006 b/tests/006
index 5b6ee51..b66a39b 100755
--- a/tests/006
+++ b/tests/006
@@ -13,7 +13,7 @@ status=1        # failure is the default!
 
 _cleanup
 
-$SHEEP $STORE/0 -z 0 -p 7000 -c $DRIVER
+$SHEEP $STORE/0 -z 0 -p 7000 -c $DRIVER -y 127.0.0.1
 sleep 1
 
 # start Sheepdog with one node
@@ -22,7 +22,7 @@ sleep 1
 
 # launch sheeps simultaneously
 for i in `seq 1 9`; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
 done
 
 _wait_for_sheep "10"
diff --git a/tests/007 b/tests/007
index 808c1e5..d1333cd 100755
--- a/tests/007
+++ b/tests/007
@@ -15,20 +15,20 @@ _cleanup
 
 
 # create a node who has wrong epoch
-$SHEEP $STORE/1 -p 7001 -z 1 -c $DRIVER
+$SHEEP $STORE/1 -p 7001 -z 1 -c $DRIVER -y 127.0.0.1
 sleep 1
 $COLLIE cluster format -p 7001 -c 1
 $COLLIE cluster shutdown -p 7001
 sleep 1
 
 # start Sheepdog with one node
-$SHEEP $STORE/0 -p 7000 -z 0 -c $DRIVER
+$SHEEP $STORE/0 -p 7000 -z 0 -c $DRIVER -y 127.0.0.1
 sleep 1
 $COLLIE cluster format -p 7000 -c 1
 
 for i in `seq 0 5`; do
-    $SHEEP $STORE/1 -p 7001 -z 1 -c $DRIVER  # should fail
-    $SHEEP $STORE/2 -p 7002 -z 2 -c $DRIVER  # should succeed
+    $SHEEP $STORE/1 -p 7001 -z 1 -c $DRIVER -y 127.0.0.1  # should fail
+    $SHEEP $STORE/2 -p 7002 -z 2 -c $DRIVER -y 127.0.0.1  # should succeed
     sleep 1
 
     if [ "`$COLLIE node list -p 7002 -r | wc -l`" -ne 2 ]; then
diff --git a/tests/008 b/tests/008
index 711fbd5..2240c5f 100755
--- a/tests/008
+++ b/tests/008
@@ -14,7 +14,7 @@ status=1        # failure is the default!
 _cleanup
 
 for i in `seq 0 7`; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
 done
 
 _wait_for_sheep "8"
@@ -39,7 +39,7 @@ for i in `seq 1 5`; do
 done
 
 for i in `seq 1 5`; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
 done
 
 echo wait for object recovery to finish
diff --git a/tests/009 b/tests/009
index 5aa821e..e7a8a2a 100755
--- a/tests/009
+++ b/tests/009
@@ -15,7 +15,7 @@ _cleanup
 
 # start three sheep daemons
 for i in 0 1 2; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
 done
 
 sleep 1
@@ -31,7 +31,7 @@ pkill -f "$SHEEP $STORE/2"
 cat /dev/urandom | $COLLIE vdi write test
 
 # restart the 3rd node
-$SHEEP $STORE/2 -z 2 -p 7002 -c $DRIVER
+$SHEEP $STORE/2 -z 2 -p 7002 -c $DRIVER -y 127.0.0.1
 
 # wait for object recovery to finish
 sleep 10
diff --git a/tests/010 b/tests/010
index 093ac0c..39d4cce 100755
--- a/tests/010
+++ b/tests/010
@@ -13,8 +13,8 @@ status=1        # failure is the default!
 
 _cleanup
 
-$SHEEP $STORE/0 -z 0 -p 7000 -c $DRIVER
-$SHEEP $STORE/1 -z 1 -p 7001 -c $DRIVER
+$SHEEP $STORE/0 -z 0 -p 7000 -c $DRIVER -y 127.0.0.1
+$SHEEP $STORE/1 -z 1 -p 7001 -c $DRIVER -y 127.0.0.1
 
 sleep 2
 
@@ -28,7 +28,7 @@ for i in `seq 0 19`; do
     $COLLIE vdi write test $((i * 4 * 1024 * 1024)) 512 < /dev/zero
 done
 
-$SHEEP $STORE/2 -z 2 -p 7002 -c $DRIVER
+$SHEEP $STORE/2 -z 2 -p 7002 -c $DRIVER -y 127.0.0.1
 
 # overwrite the objects
 for i in `seq 0 19`; do
diff --git a/tests/011 b/tests/011
index 4059624..71af0f8 100755
--- a/tests/011
+++ b/tests/011
@@ -33,7 +33,7 @@ for i in 0 1 2; do
     mkfs.xfs -f $STORE/$i.img > $seq.full
     mkdir $STORE/$i
     mount -o loop $STORE/$i.img $STORE/$i
-    $SHEEP $STORE/$i/ -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i/ -z $i -p 700$i -c $DRIVER -y 127.0.0.1
 done
 
 sleep 1
diff --git a/tests/012 b/tests/012
index f558241..cb58af2 100755
--- a/tests/012
+++ b/tests/012
@@ -14,11 +14,11 @@ status=1        # failure is the default!
 _cleanup
 
 for i in 0 1 2; do
-    $SHEEP $STORE/$i/ -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i/ -z $i -p 700$i -c $DRIVER -y 127.0.0.1
 done
 
 # add gateway node
-$SHEEP $STORE/4/ -z 4 -p 7004 -c $DRIVER -g
+$SHEEP $STORE/4/ -z 4 -p 7004 -c $DRIVER -y 127.0.0.1 -g
 
 sleep 1
 
diff --git a/tests/013 b/tests/013
index b55ccae..e9f37d4 100755
--- a/tests/013
+++ b/tests/013
@@ -14,7 +14,7 @@ status=1        # failure is the default!
 _cleanup
 
 for i in 0 1 2; do
-    $SHEEP $STORE/$i -p 700$i -z $i -c $DRIVER
+    $SHEEP $STORE/$i -p 700$i -z $i -c $DRIVER -y 127.0.0.1
 done
 
 sleep 1
diff --git a/tests/014 b/tests/014
index 03b4e6d..9713f57 100755
--- a/tests/014
+++ b/tests/014
@@ -14,7 +14,7 @@ status=1        # failure is the default!
 _cleanup
 
 for i in 0 2; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
 done
 
 sleep 1
diff --git a/tests/015 b/tests/015
index 5ef362a..f72f39c 100755
--- a/tests/015
+++ b/tests/015
@@ -14,7 +14,7 @@ status=1        # failure is the default!
 _cleanup
 
 for i in 0 2; do
-    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -z $i -p 700$i -c $DRIVER -y 127.0.0.1
 done
 
 sleep 1
diff --git a/tests/016 b/tests/016
index df773fe..dea7a5b 100755
--- a/tests/016
+++ b/tests/016
@@ -14,7 +14,7 @@ status=1        # failure is the default!
 _cleanup
 
 for i in 0 1 2; do
-    $SHEEP $STORE/$i -s 4096 -p 700$i -z $i -c $DRIVER
+    $SHEEP $STORE/$i -s 4096 -p 700$i -z $i -c $DRIVER -y 127.0.0.1
 done
 
 sleep 1;
diff --git a/tests/017 b/tests/017
index 73bb07a..76ef37f 100755
--- a/tests/017
+++ b/tests/017
@@ -14,7 +14,7 @@ status=1        # failure is the default!
 _cleanup
 
 for i in 0 1 2; do
-    $SHEEP $STORE/$i -p 700$i -z $i -c $DRIVER
+    $SHEEP $STORE/$i -p 700$i -z $i -c $DRIVER -y 127.0.0.1
 done
 
 sleep 1
diff --git a/tests/018 b/tests/018
index 00d6ee5..b1bcca3 100755
--- a/tests/018
+++ b/tests/018
@@ -16,7 +16,7 @@ status=1        # failure is the default!
 _cleanup
 
 for i in `seq 0 2`; do
-    $SHEEP $STORE/$i -w 100,writeback -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -w 100,writeback -z $i -p 700$i -c $DRIVER -y 127.0.0.1
 done
 
 _wait_for_sheep "3"
diff --git a/tests/019 b/tests/019
index e6556ec..5144347 100755
--- a/tests/019
+++ b/tests/019
@@ -16,7 +16,7 @@ status=1        # failure is the default!
 _cleanup
 
 for i in `seq 0 2`; do
-    $SHEEP $STORE/$i -w 100 -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -w 100 -z $i -p 700$i -c $DRIVER -y 127.0.0.1
 done
 
 _wait_for_sheep "3"
diff --git a/tests/020 b/tests/020
index 242dab8..ba57203 100755
--- a/tests/020
+++ b/tests/020
@@ -16,7 +16,7 @@ status=1        # failure is the default!
 _cleanup
 
 for i in `seq 0 2`; do
-    $SHEEP $STORE/$i -d -w 20 -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -d -w 20 -z $i -p 700$i -c $DRIVER -y 127.0.0.1
 done
 
 _wait_for_sheep "3"
diff --git a/tests/021 b/tests/021
index 2392eda..8b17914 100755
--- a/tests/021
+++ b/tests/021
@@ -16,7 +16,7 @@ status=1        # failure is the default!
 _cleanup
 
 for i in `seq 0 7`; do
-    $SHEEP $STORE/$i -d -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -d -z $i -p 700$i -c $DRIVER -y 127.0.0.1
 done
 
 _wait_for_sheep "8"
@@ -35,7 +35,7 @@ sleep 1
 for i in `seq 1 5`; do pkill -f "sheep $STORE/$i";done
 sleep 10
 for i in `seq 1 5`; do
-    $SHEEP $STORE/$i -d -w 20 -z $i -p 700$i -c $DRIVER
+    $SHEEP $STORE/$i -d -w 20 -z $i -p 700$i -c $DRIVER -y 127.0.0.1
 done
 
 _wait_for_collie
-- 
1.7.10.2

More information about the sheepdog mailing list