tests, shard: Remove dependency on strict-write-ordering

        Backport of: http://review.gluster.org/#/c/12915/

Change-Id: I11968c32e57f73589e442fa13391f922fa4bbf2a
BUG: 1290655
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/12946
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>

5 files changed, 9 insertions, 10 deletions

diff --git a/tests/bugs/shard/bug-1251824.t b/tests/bugs/shard/bug-1251824.t
index 9e6ceaa8161..cdb6c5e9f72 100644
--- a/tests/bugs/shard/bug-1251824.t
+++ b/tests/bugs/shard/bug-1251824.t
@@ -7,9 +7,8 @@ cleanup;
 
 TEST glusterd
 TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/${V0}{0,1}
+TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1,2,3}
 TEST $CLI volume set $V0 features.shard on
-TEST $CLI volume set $V0 performance.strict-write-ordering on
 TEST $CLI volume start $V0
 
 TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0
@@ -41,6 +40,10 @@ EXPECT "root" echo `find $B0/${V0}0 -name .shard | xargs stat -c %U`
 EXPECT "root" echo `find $B0/${V0}0 -name .shard | xargs stat -c %G`
 EXPECT "root" echo `find $B0/${V0}1 -name .shard | xargs stat -c %U`
 EXPECT "root" echo `find $B0/${V0}1 -name .shard | xargs stat -c %G`
+EXPECT "root" echo `find $B0/${V0}2 -name .shard | xargs stat -c %U`
+EXPECT "root" echo `find $B0/${V0}2 -name .shard | xargs stat -c %G`
+EXPECT "root" echo `find $B0/${V0}3 -name .shard | xargs stat -c %U`
+EXPECT "root" echo `find $B0/${V0}3 -name .shard | xargs stat -c %G`
 
 # Write 6M of data on bar as root.
 TEST dd if=/dev/zero of=$M0/bar bs=1M count=6
diff --git a/tests/bugs/shard/bug-1256580.t b/tests/bugs/shard/bug-1256580.t
index c1704e2022a..fed13679253 100644
--- a/tests/bugs/shard/bug-1256580.t
+++ b/tests/bugs/shard/bug-1256580.t
@@ -6,9 +6,8 @@ cleanup
 
 TEST glusterd
 TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/${V0}{0,1}
+TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1,2,3}
 TEST $CLI volume set $V0 features.shard on
-TEST $CLI volume set $V0 performance.strict-write-ordering on
 TEST $CLI volume start $V0
 
 TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0
diff --git a/tests/bugs/shard/bug-1258334.t b/tests/bugs/shard/bug-1258334.t
index c89caaba3f7..94ed822aae8 100644
--- a/tests/bugs/shard/bug-1258334.t
+++ b/tests/bugs/shard/bug-1258334.t
@@ -6,9 +6,8 @@ cleanup
 
 TEST glusterd
 TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/${V0}{0,1}
+TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1,2,3}
 TEST $CLI volume set $V0 features.shard on
-TEST $CLI volume set $V0 performance.strict-write-ordering on
 TEST $CLI volume start $V0
 
 TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0
diff --git a/tests/bugs/shard/bug-1259651.t b/tests/bugs/shard/bug-1259651.t
index a1742dea7dd..72856fdbaad 100644
--- a/tests/bugs/shard/bug-1259651.t
+++ b/tests/bugs/shard/bug-1259651.t
@@ -6,7 +6,7 @@ cleanup
 
 TEST glusterd
 TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/${V0}{0,1}
+TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1,2,3}
 TEST $CLI volume start $V0
 
 TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0
@@ -24,7 +24,6 @@ md5sum_file_plain=$(md5sum $M0/dir/file_plain | awk '{print $1}')
 
 # Now enable sharding on the volume.
 TEST $CLI volume set $V0 features.shard on
-TEST $CLI volume set $V0 performance.strict-write-ordering on
 
 # Create a sharded file called "file_sharded"
 TEST touch $M0/dir/file_sharded
diff --git a/tests/bugs/shard/bug-1272986.t b/tests/bugs/shard/bug-1272986.t
index c041ce49482..762887051fa 100644
--- a/tests/bugs/shard/bug-1272986.t
+++ b/tests/bugs/shard/bug-1272986.t
@@ -6,9 +6,8 @@ cleanup
 
 TEST glusterd
 TEST pidof glusterd
-TEST $CLI volume create $V0 $H0:$B0/${V0}{0,1}
+TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1,2,3}
 TEST $CLI volume set $V0 features.shard on
-TEST $CLI volume set $V0 performance.strict-write-ordering on
 TEST $CLI volume start $V0
 
 # $M0 is where the reads will be done and $M1 is where files will be created,