diff options
| -rw-r--r-- | tests/bugs/bug-1032894.t | 33 | ||||
| -rw-r--r-- | tests/volume.rc | 5 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-common.c | 2 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heald.c | 10 |
4 files changed, 45 insertions, 5 deletions
diff --git a/tests/bugs/bug-1032894.t b/tests/bugs/bug-1032894.t new file mode 100644 index 00000000000..2a2b77fece9 --- /dev/null +++ b/tests/bugs/bug-1032894.t @@ -0,0 +1,33 @@ +#!/bin/bash + +. $(dirname $0)/../include.rc +. $(dirname $0)/../volume.rc + +#Check stale indices are deleted as part of self-heal-daemon crawl. +cleanup; + +TEST glusterd +TEST pidof glusterd +TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1} +TEST $CLI volume set $V0 cluster.self-heal-daemon off +TEST $CLI volume start $V0 +TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 +cd $M0 +TEST mkdir a +cd a +TEST kill_brick $V0 $H0 $B0/${V0}0 +# Create stale indices +for i in {1..10}; do echo abc > $i; done +for i in {1..10}; do rm -f $i; done + +TEST $CLI volume start $V0 force +EXPECT_WITHIN 20 "1" afr_child_up_status_in_shd $V0 0 +TEST $CLI volume set $V0 cluster.self-heal-daemon on +EXPECT_WITHIN 20 "Y" glustershd_up_status + +#Since maximum depth of the directory structure that needs healin is 2 +#Trigger two self-heals. That should make sure the heal is complete +TEST $CLI volume heal $V0 + +EXPECT_WITHIN 20 "0" afr_get_index_count $B0/${V0}1 +cleanup diff --git a/tests/volume.rc b/tests/volume.rc index 7d2494067e8..301b57b8d42 100644 --- a/tests/volume.rc +++ b/tests/volume.rc @@ -359,3 +359,8 @@ function volume_exists() { return 0 fi } + +function afr_get_index_count { + local brick=$1 + ls $1/.glusterfs/indices/xattrop | grep -v xattrop | wc -l +} diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index 6b39dcf9dbc..df14cbb0fb7 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -907,7 +907,7 @@ afr_selfheal_unlocked_inspect (call_frame_t *frame, xlator_t *this, goto out; } } else if (valid_cnt < 2) { - ret = -ENOTCONN; + ret = -ENOTCONN; goto out; } diff --git a/xlators/cluster/afr/src/afr-self-heald.c b/xlators/cluster/afr/src/afr-self-heald.c index 787cb4ff557..0ff4c0cb1fc 100644 --- a/xlators/cluster/afr/src/afr-self-heald.c +++ b/xlators/cluster/afr/src/afr-self-heald.c @@ -303,6 +303,11 @@ afr_shd_selfheal (struct subvol_healer *healer, int child, uuid_t gfid) subvol = priv->children[child]; + //If this fails with ENOENT/ESTALE index is stale + ret = afr_shd_gfid_to_path (this, subvol, gfid, &path); + if (ret < 0) + return ret; + ret = afr_selfheal (this, gfid); if (ret == -EIO) { @@ -316,10 +321,6 @@ afr_shd_selfheal (struct subvol_healer *healer, int child, uuid_t gfid) crawl_event->healed_count++; } - afr_shd_gfid_to_path (this, subvol, gfid, &path); - if (!path) - return ret; - if (eh) { shd_event = GF_CALLOC (1, sizeof(*shd_event), gf_afr_mt_shd_event_t); @@ -334,6 +335,7 @@ afr_shd_selfheal (struct subvol_healer *healer, int child, uuid_t gfid) if (eh_save_history (eh, shd_event) < 0) { GF_FREE (shd_event); GF_FREE (path); + return ret; } } return ret; |