diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/basic/afr/gfid-unsplit-type-mismatch.t | 5 | ||||
| -rw-r--r-- | tests/basic/afr/gfid-unsplit.t | 5 | ||||
| -rw-r--r-- | tests/basic/afr/shd-autofix-nogfid.t | 5 | ||||
| -rw-r--r-- | tests/basic/afr/shd-force-inspect.t | 5 | ||||
| -rw-r--r-- | tests/basic/afr/shd-pgfid-heal.t | 5 | ||||
| -rwxr-xr-x | tests/bugs/fb2506544_ctime.t | 8 | ||||
| -rwxr-xr-x | tests/bugs/fb2506544_majority.t | 9 | ||||
| -rwxr-xr-x | tests/bugs/fb2506544_mtime.t | 8 | ||||
| -rwxr-xr-x | tests/bugs/fb2506544_size.t | 8 |
9 files changed, 18 insertions, 40 deletions
diff --git a/tests/basic/afr/gfid-unsplit-type-mismatch.t b/tests/basic/afr/gfid-unsplit-type-mismatch.t index 9e205021a0d..172645d3fae 100644 --- a/tests/basic/afr/gfid-unsplit-type-mismatch.t +++ b/tests/basic/afr/gfid-unsplit-type-mismatch.t @@ -15,9 +15,8 @@ TEST $CLI volume set $V0 cluster.choose-local off TEST $CLI volume set $V0 cluster.self-heal-daemon off TEST $CLI volume set $V0 nfs.disable on TEST $CLI volume set $V0 cluster.quorum-type none -TEST $CLI volume set $V0 cluster.favorite-child-policy mtime -#EST $CLI volume set $V0 cluster.favorite-child-by-majority on -#EST $CLI volume set $V0 cluster.favorite-child-by-mtime on +TEST $CLI volume set $V0 cluster.favorite-child-by-majority on +TEST $CLI volume set $V0 cluster.favorite-child-by-mtime on TEST $CLI volume set $V0 cluster.metadata-self-heal off TEST $CLI volume set $V0 cluster.data-self-heal off TEST $CLI volume set $V0 cluster.entry-self-heal off diff --git a/tests/basic/afr/gfid-unsplit.t b/tests/basic/afr/gfid-unsplit.t index 0b883ab658f..d6cb7e74a8a 100644 --- a/tests/basic/afr/gfid-unsplit.t +++ b/tests/basic/afr/gfid-unsplit.t @@ -17,9 +17,8 @@ TEST $CLI volume set $V0 cluster.choose-local off TEST $CLI volume set $V0 cluster.quorum-type none TEST $CLI volume set $V0 cluster.self-heal-daemon off TEST $CLI volume set $V0 nfs.disable off -#EST $CLI volume set $V0 cluster.favorite-child-by-majority on -#EST $CLI volume set $V0 cluster.favorite-child-by-mtime on -TEST $CLI volume set $V0 cluster.favorite-child-policy mtime +TEST $CLI volume set $V0 cluster.favorite-child-by-majority on +TEST $CLI volume set $V0 cluster.favorite-child-by-mtime on TEST $CLI volume set $V0 cluster.metadata-self-heal off TEST $CLI volume set $V0 cluster.data-self-heal off TEST $CLI volume set $V0 cluster.entry-self-heal off diff --git a/tests/basic/afr/shd-autofix-nogfid.t b/tests/basic/afr/shd-autofix-nogfid.t index 8bc2c965640..f54a8eb8600 100644 --- a/tests/basic/afr/shd-autofix-nogfid.t +++ b/tests/basic/afr/shd-autofix-nogfid.t @@ -15,9 +15,8 @@ TEST $CLI volume set $V0 cluster.choose-local off TEST $CLI volume set $V0 cluster.self-heal-daemon on TEST $CLI volume set $V0 nfs.disable on TEST $CLI volume set $V0 cluster.quorum-type auto -TEST $CLI volume set $V0 cluster.favorite-child-policy majority -#EST $CLI volume set $V0 cluster.favorite-child-by-majority on -#EST $CLI volume set $V0 cluster.favorite-child-by-mtime on +TEST $CLI volume set $V0 cluster.favorite-child-by-majority on +TEST $CLI volume set $V0 cluster.favorite-child-by-mtime on TEST $CLI volume set $V0 cluster.metadata-self-heal off TEST $CLI volume set $V0 cluster.data-self-heal off TEST $CLI volume set $V0 cluster.entry-self-heal off diff --git a/tests/basic/afr/shd-force-inspect.t b/tests/basic/afr/shd-force-inspect.t index caceb841322..c8b027c8933 100644 --- a/tests/basic/afr/shd-force-inspect.t +++ b/tests/basic/afr/shd-force-inspect.t @@ -15,9 +15,8 @@ TEST $CLI volume set $V0 cluster.choose-local off TEST $CLI volume set $V0 cluster.self-heal-daemon on TEST $CLI volume set $V0 nfs.disable on TEST $CLI volume set $V0 cluster.quorum-type none -TEST $CLI volume set $V0 cluster.favorite-child-policy majority -#EST $CLI volume set $V0 cluster.favorite-child-by-majority on -#EST $CLI volume set $V0 cluster.favorite-child-by-mtime on +TEST $CLI volume set $V0 cluster.favorite-child-by-majority on +TEST $CLI volume set $V0 cluster.favorite-child-by-mtime on TEST $CLI volume set $V0 cluster.metadata-self-heal off TEST $CLI volume set $V0 cluster.data-self-heal off TEST $CLI volume set $V0 cluster.entry-self-heal off diff --git a/tests/basic/afr/shd-pgfid-heal.t b/tests/basic/afr/shd-pgfid-heal.t index 6213e4c6374..d723fe436a6 100644 --- a/tests/basic/afr/shd-pgfid-heal.t +++ b/tests/basic/afr/shd-pgfid-heal.t @@ -15,10 +15,9 @@ TEST $CLI volume set $V0 cluster.choose-local off TEST $CLI volume set $V0 cluster.self-heal-daemon on TEST $CLI volume set $V0 nfs.disable on TEST $CLI volume set $V0 cluster.quorum-type none -#EST $CLI volume set $V0 cluster.favorite-child-by-majority on -#EST $CLI volume set $V0 cluster.favorite-child-by-mtime on +TEST $CLI volume set $V0 cluster.favorite-child-by-majority on +TEST $CLI volume set $V0 cluster.favorite-child-by-mtime on TEST $CLI volume set $V0 cluster.pgfid-self-heal on -TEST $CLI volume set $V0 cluster.favorite-child-policy majority TEST $CLI volume set $V0 storage.build-pgfid on TEST $CLI volume set $V0 cluster.metadata-self-heal off TEST $CLI volume set $V0 cluster.data-self-heal off diff --git a/tests/bugs/fb2506544_ctime.t b/tests/bugs/fb2506544_ctime.t index 8c7ab02cc8e..f59525db590 100755 --- a/tests/bugs/fb2506544_ctime.t +++ b/tests/bugs/fb2506544_ctime.t @@ -16,7 +16,6 @@ TEST $CLI volume set $V0 cluster.self-heal-daemon off TEST $CLI volume set $V0 cluster.data-self-heal on TEST $CLI volume set $V0 cluster.metadata-self-heal on TEST $CLI volume set $V0 cluster.entry-self-heal on -#EST $CLI volume set $V0 cluster.favorite-child-by-ctime off TEST $CLI volume set $V0 cluster.quorum-type fixed TEST $CLI volume set $V0 cluster.quorum-count 1 TEST $CLI volume start $V0 @@ -61,8 +60,7 @@ sleep 1 # Ok now turn the favorite-child option and we should be able to read it. # The MD5 should be of the file which was created first. umount $M0 -#EST $CLI volume set $V0 cluster.favorite-child-by-ctime on -TEST $CLI volume set $V0 cluster.favorite-child-policy ctime +TEST $CLI volume set $V0 cluster.favorite-child-by-ctime on sleep 1 # Mount the volume TEST glusterfs --log-level DEBUG --volfile-id=/$V0 --volfile-server=$H0 $M0 \ @@ -85,7 +83,6 @@ TEST $CLI volume set $V0 cluster.self-heal-daemon off TEST $CLI volume set $V0 cluster.data-self-heal on TEST $CLI volume set $V0 cluster.metadata-self-heal on TEST $CLI volume set $V0 cluster.entry-self-heal on -#EST $CLI volume set $V0 cluster.favorite-child-by-ctime off TEST $CLI volume set $V0 cluster.quorum-type fixed TEST $CLI volume set $V0 cluster.quorum-count 1 TEST $CLI volume start $V0 @@ -131,8 +128,7 @@ sleep 1 # Ok now turn the favorite-child option and we should be able to read it. # The MD5 should be of the file which was created first. umount $M0 -#EST $CLI volume set $V0 cluster.favorite-child-by-ctime on -TEST $CLI volume set $V0 cluster.favorite-child-policy ctime +TEST $CLI volume set $V0 cluster.favorite-child-by-ctime on TEST $CLI volume set $V0 cluster.self-heal-daemon on sleep 1 /etc/init.d/glusterd restart_shd diff --git a/tests/bugs/fb2506544_majority.t b/tests/bugs/fb2506544_majority.t index c38a6d59947..a2c489a4063 100755 --- a/tests/bugs/fb2506544_majority.t +++ b/tests/bugs/fb2506544_majority.t @@ -16,8 +16,6 @@ TEST $CLI volume set $V0 cluster.self-heal-daemon off TEST $CLI volume set $V0 cluster.data-self-heal on TEST $CLI volume set $V0 cluster.metadata-self-heal on TEST $CLI volume set $V0 cluster.entry-self-heal on -#EST $CLI volume set $V0 cluster.favorite-child-by-majority off -TEST $CLI volume set $V0 cluster.favorite-child-policy majority # This would normally be a toxic combination because it allows us to create a # split brain by writing to 1/3 replicas ... but for testing that's exactly # what we want. @@ -67,8 +65,7 @@ sleep 1 # Compare MD5's, the healed file should be that of the file which is # on 2/3 bricks. umount $M0 -#EST $CLI volume set $V0 cluster.favorite-child-by-majority on -TEST $CLI volume set $V0 cluster.favorite-child-policy majority +TEST $CLI volume set $V0 cluster.favorite-child-by-majority on sleep 1 # Mount the volume TEST glusterfs --log-level DEBUG --volfile-id=/$V0 --volfile-server=$H0 $M0 \ @@ -91,7 +88,6 @@ TEST $CLI volume set $V0 cluster.self-heal-daemon off TEST $CLI volume set $V0 cluster.data-self-heal off TEST $CLI volume set $V0 cluster.metadata-self-heal off TEST $CLI volume set $V0 cluster.entry-self-heal off -#EST $CLI volume set $V0 cluster.favorite-child-by-majority off TEST $CLI volume set $V0 cluster.quorum-type fixed TEST $CLI volume set $V0 cluster.quorum-count 1 TEST $CLI volume start $V0 @@ -139,8 +135,7 @@ sleep 1 # Compare MD5's, the healed file should be that of the file which is # on 2/3 bricks. umount $M0 -#EST $CLI volume set $V0 cluster.favorite-child-by-majority on -TEST $CLI volume set $V0 cluster.favorite-child-policy majority +TEST $CLI volume set $V0 cluster.favorite-child-by-majority on TEST $CLI volume set $V0 cluster.self-heal-daemon on sleep 1 /etc/init.d/glusterd restart_shd diff --git a/tests/bugs/fb2506544_mtime.t b/tests/bugs/fb2506544_mtime.t index b908fdaddd5..b68c6b2e089 100755 --- a/tests/bugs/fb2506544_mtime.t +++ b/tests/bugs/fb2506544_mtime.t @@ -16,7 +16,6 @@ TEST $CLI volume set $V0 cluster.self-heal-daemon off TEST $CLI volume set $V0 cluster.data-self-heal on TEST $CLI volume set $V0 cluster.metadata-self-heal on TEST $CLI volume set $V0 cluster.entry-self-heal on -#EST $CLI volume set $V0 cluster.favorite-child-by-mtime off TEST $CLI volume set $V0 cluster.quorum-type fixed TEST $CLI volume set $V0 cluster.quorum-count 1 TEST $CLI volume start $V0 @@ -62,8 +61,7 @@ sleep 1 # Ok now turn the favorite-child option and we should be able to read it. # Compare MD5's, the MD5 should be of the file we modified last. umount $M0 -#EST $CLI volume set $V0 cluster.favorite-child-by-mtime on -TEST $CLI volume set $V0 cluster.favorite-child-policy mtime +TEST $CLI volume set $V0 cluster.favorite-child-by-mtime on sleep 1 # Mount the volume TEST glusterfs --log-level DEBUG --volfile-id=/$V0 --volfile-server=$H0 $M0 \ @@ -86,7 +84,6 @@ TEST $CLI volume set $V0 cluster.self-heal-daemon off TEST $CLI volume set $V0 cluster.data-self-heal off TEST $CLI volume set $V0 cluster.metadata-self-heal off TEST $CLI volume set $V0 cluster.entry-self-heal off -#EST $CLI volume set $V0 cluster.favorite-child-by-mtime off TEST $CLI volume set $V0 cluster.quorum-type fixed TEST $CLI volume set $V0 cluster.quorum-count 1 TEST $CLI volume start $V0 @@ -134,8 +131,7 @@ sleep 1 # Ok now turn the favorite-child option and we should be able to read it. # Compare MD5's, the MD5 should be of the file we modified last. umount $M0 -#EST $CLI volume set $V0 cluster.favorite-child-by-mtime on -TEST $CLI volume set $V0 cluster.favorite-child-policy mtime +TEST $CLI volume set $V0 cluster.favorite-child-by-mtime on TEST $CLI volume set $V0 cluster.self-heal-daemon on sleep 1 /etc/init.d/glusterd restart_shd diff --git a/tests/bugs/fb2506544_size.t b/tests/bugs/fb2506544_size.t index 593c1053853..731ffd13f56 100755 --- a/tests/bugs/fb2506544_size.t +++ b/tests/bugs/fb2506544_size.t @@ -16,7 +16,6 @@ TEST $CLI volume set $V0 cluster.self-heal-daemon off TEST $CLI volume set $V0 cluster.data-self-heal on TEST $CLI volume set $V0 cluster.metadata-self-heal on TEST $CLI volume set $V0 cluster.entry-self-heal on -#EST $CLI volume set $V0 cluster.favorite-child-by-size off TEST $CLI volume set $V0 cluster.quorum-type fixed TEST $CLI volume set $V0 cluster.quorum-count 1 TEST $CLI volume start $V0 @@ -61,8 +60,7 @@ sleep 1 # Ok now turn the favorite-child option and we should be able to read it. # Compare MD5's, the MD5 should be of the file that is the largest. umount $M0 -#EST $CLI volume set $V0 cluster.favorite-child-by-size on -TEST $CLI volume set $V0 cluster.favorite-child-policy size +TEST $CLI volume set $V0 cluster.favorite-child-by-size on sleep 1 # Mount the volume TEST glusterfs --log-level DEBUG --volfile-id=/$V0 --volfile-server=$H0 $M0 \ @@ -88,7 +86,6 @@ TEST $CLI volume set $V0 cluster.self-heal-daemon off TEST $CLI volume set $V0 cluster.data-self-heal off TEST $CLI volume set $V0 cluster.metadata-self-heal off TEST $CLI volume set $V0 cluster.entry-self-heal off -#EST $CLI volume set $V0 cluster.favorite-child-by-size off TEST $CLI volume set $V0 cluster.quorum-type fixed TEST $CLI volume set $V0 cluster.quorum-count 1 TEST $CLI volume start $V0 @@ -135,8 +132,7 @@ sleep 1 # Ok now turn the favorite-child option and we should be able to read it. # Compare MD5's, the MD5 should be of the file that is the largest. umount $M0 -#EST $CLI volume set $V0 cluster.favorite-child-by-size on -TEST $CLI volume set $V0 cluster.favorite-child-policy size +TEST $CLI volume set $V0 cluster.favorite-child-by-size on TEST $CLI volume set $V0 cluster.self-heal-daemon on sleep 1 /etc/init.d/glusterd restart_shd |