diff options
Diffstat (limited to '0255-Revert-tier-shd-glusterd-with-shd-mux-the-shd-volfil.patch')
| -rw-r--r-- | 0255-Revert-tier-shd-glusterd-with-shd-mux-the-shd-volfil.patch | 104 |
1 files changed, 104 insertions, 0 deletions
diff --git a/0255-Revert-tier-shd-glusterd-with-shd-mux-the-shd-volfil.patch b/0255-Revert-tier-shd-glusterd-with-shd-mux-the-shd-volfil.patch new file mode 100644 index 0000000..89a8aaf --- /dev/null +++ b/0255-Revert-tier-shd-glusterd-with-shd-mux-the-shd-volfil.patch @@ -0,0 +1,104 @@ +From 684a4949552164d3469329b3f959de4369d54faa Mon Sep 17 00:00:00 2001 +From: Atin Mukherjee <amukherj@redhat.com> +Date: Sun, 14 Jul 2019 08:06:11 +0530 +Subject: [PATCH 255/255] Revert "tier/shd/glusterd: with shd mux, the shd + volfile path have to be updated for tier-heald.t" + +This reverts commit 6e7d333625ecd9f7402c2e839338350fa86eaf45. + +Updates: bz#1471742 +Change-Id: I6c27634999f72b5bbb35d5d13cdebda7af072b01 +Reviewed-on: https://code.engineering.redhat.com/gerrit/176017 +Tested-by: RHGS Build Bot <nigelb@redhat.com> +Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com> +--- + tests/basic/tier/tier-heald.t | 35 +++++++++++++++-------------------- + 1 file changed, 15 insertions(+), 20 deletions(-) + +diff --git a/tests/basic/tier/tier-heald.t b/tests/basic/tier/tier-heald.t +index 0ec9e43..a8e634f 100644 +--- a/tests/basic/tier/tier-heald.t ++++ b/tests/basic/tier/tier-heald.t +@@ -11,7 +11,7 @@ cleanup; + TEST glusterd + TEST pidof glusterd + +-r2_volfile=$(gluster system:: getwd)"/vols/r2/r2-shd.vol" ++volfile=$(gluster system:: getwd)"/glustershd/glustershd-server.vol" + + # Commands should fail when both tiers are not of distribute type. + # Glustershd shouldn't be running as long as there are no replicate/disperse +@@ -34,56 +34,51 @@ TEST $CLI volume tier r2 attach $H0:$B0/r2_hot + EXPECT_WITHIN $PROCESS_UP_TIMEOUT "[0-9][0-9]*" get_shd_process_pid + TEST $CLI volume heal r2 enable + EXPECT "enable" volume_option r2 "cluster.self-heal-daemon" +-EXPECT "enable" volgen_volume_option $r2_volfile r2-replicate-0 cluster replicate self-heal-daemon ++EXPECT "enable" volgen_volume_option $volfile r2-replicate-0 cluster replicate self-heal-daemon + EXPECT_WITHIN $PROCESS_UP_TIMEOUT "[0-9][0-9]*" get_shd_process_pid + TEST $CLI volume heal r2 disable + EXPECT "disable" volume_option r2 "cluster.self-heal-daemon" +-EXPECT "disable" volgen_volume_option $r2_volfile r2-replicate-0 cluster replicate self-heal-daemon ++EXPECT "disable" volgen_volume_option $volfile r2-replicate-0 cluster replicate self-heal-daemon + EXPECT_WITHIN $PROCESS_UP_TIMEOUT "[0-9][0-9]*" get_shd_process_pid + # Commands should work on disperse volume. + TEST $CLI volume create ec2 disperse 3 redundancy 1 $H0:$B0/ec2_0 $H0:$B0/ec2_1 $H0:$B0/ec2_2 + TEST $CLI volume start ec2 + +-ec2_volfile=$(gluster system:: getwd)"/vols/ec2/ec2-shd.vol" +- + TEST $CLI volume tier ec2 attach replica 2 $H0:$B0/ec2_hot{1..4} + EXPECT_WITHIN $PROCESS_UP_TIMEOUT "[0-9][0-9]*" get_shd_process_pid + TEST $CLI volume heal ec2 enable + EXPECT "enable" volume_option ec2 "cluster.disperse-self-heal-daemon" +-EXPECT "enable" volgen_volume_option $ec2_volfile ec2-disperse-0 cluster disperse self-heal-daemon ++EXPECT "enable" volgen_volume_option $volfile ec2-disperse-0 cluster disperse self-heal-daemon + EXPECT_WITHIN $PROCESS_UP_TIMEOUT "[0-9][0-9]*" get_shd_process_pid + TEST $CLI volume heal ec2 disable + EXPECT "disable" volume_option ec2 "cluster.disperse-self-heal-daemon" +-EXPECT "disable" volgen_volume_option $ec2_volfile ec2-disperse-0 cluster disperse self-heal-daemon ++EXPECT "disable" volgen_volume_option $volfile ec2-disperse-0 cluster disperse self-heal-daemon + EXPECT_WITHIN $PROCESS_UP_TIMEOUT "[0-9][0-9]*" get_shd_process_pid + + #Check that shd graph is rewritten correctly on volume stop/start +-EXPECT "Y" volgen_volume_exists $ec2_volfile ec2-disperse-0 cluster disperse +-EXPECT "Y" volgen_volume_exists $r2_volfile r2-replicate-0 cluster replicate ++EXPECT "Y" volgen_volume_exists $volfile ec2-disperse-0 cluster disperse ++EXPECT "Y" volgen_volume_exists $volfile r2-replicate-0 cluster replicate + TEST $CLI volume stop r2 +-EXPECT "Y" volgen_volume_exists $ec2_volfile ec2-disperse-0 cluster disperse +- +-# Has been commented as the validations after stop using volfile dont hold true. +-#EXPECT "N" volgen_volume_exists $r2_volfile r2-replicate-0 cluster replicate ++EXPECT "Y" volgen_volume_exists $volfile ec2-disperse-0 cluster disperse ++EXPECT "N" volgen_volume_exists $volfile r2-replicate-0 cluster replicate + TEST $CLI volume stop ec2 + # When both the volumes are stopped glustershd volfile is not modified just the + # process is stopped + TEST "[ -z $(get_shd_process_pid) ]" + + TEST $CLI volume start r2 +-# Has been commented as the validations after stop using volfile dont hold true. +-#EXPECT "N" volgen_volume_exists $ec2_volfile ec2-disperse-0 cluster disperse +-EXPECT "Y" volgen_volume_exists $r2_volfile r2-replicate-0 cluster replicate ++EXPECT "N" volgen_volume_exists $volfile ec2-disperse-0 cluster disperse ++EXPECT "Y" volgen_volume_exists $volfile r2-replicate-0 cluster replicate + + TEST $CLI volume start ec2 + +-EXPECT "Y" volgen_volume_exists $ec2_volfile ec2-disperse-0 cluster disperse +-EXPECT "Y" volgen_volume_exists $ec2_volfile ec2-replicate-0 cluster replicate ++EXPECT "Y" volgen_volume_exists $volfile ec2-disperse-0 cluster disperse ++EXPECT "Y" volgen_volume_exists $volfile ec2-replicate-0 cluster replicate + + TEST $CLI volume tier ec2 detach force + +-EXPECT "Y" volgen_volume_exists $ec2_volfile ec2-disperse-0 cluster disperse +-EXPECT "N" volgen_volume_exists $ec2_volfile ec2-replicate-0 cluster replicate ++EXPECT "Y" volgen_volume_exists $volfile ec2-disperse-0 cluster disperse ++EXPECT "N" volgen_volume_exists $volfile ec2-replicate-0 cluster replicate + + TEST $CLI volume set r2 self-heal-daemon on + TEST $CLI volume set r2 cluster.self-heal-daemon off +-- +1.8.3.1 + |