diff options
| author | Vikas Gorur <vikas@gluster.com> | 2009-04-20 03:54:04 -0700 |
|---|---|---|
| committer | Anand V. Avati <avati@amp.gluster.com> | 2009-04-20 18:01:24 +0530 |
| commit | 82394d484803e02e28441bc0b988efaaff60dd94 (patch) | |
| tree | 87e5031e88f5de1abd3ea880b79aeb57ac0a545d | |
| parent | fbefbfee743a01b5ad9977ad24de372258aeb65c (diff) | |
Check return value of afr_sh_select_source.
If select_source returns -1, abort self-heal.
Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-common.c | 1 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-data.c | 9 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-metadata.c | 9 |
3 files changed, 18 insertions, 1 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index f6a4bf9f..6a7f2d93 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -29,7 +29,6 @@ /** * select_source - select a source and return it - * TODO: take into account option 'favorite-child' */ int diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c index a7a3d44f..29ede007 100644 --- a/xlators/cluster/afr/src/afr-self-heal-data.c +++ b/xlators/cluster/afr/src/afr-self-heal-data.c @@ -821,6 +821,15 @@ afr_sh_data_fix (call_frame_t *frame, xlator_t *this) } source = afr_sh_select_source (sh->sources, priv->child_count); + + if (source == -1) { + gf_log (this->name, GF_LOG_DEBUG, + "No active sources found."); + + afr_sh_data_finish (frame, this); + return 0; + } + sh->source = source; /* detect changes not visible through pending flags -- JIC */ diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c index 8e832698..6468d7fc 100644 --- a/xlators/cluster/afr/src/afr-self-heal-metadata.c +++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c @@ -568,6 +568,15 @@ afr_sh_metadata_fix (call_frame_t *frame, xlator_t *this) } source = afr_sh_select_source (sh->sources, priv->child_count); + + if (source == -1) { + gf_log (this->name, GF_LOG_DEBUG, + "No active sources found."); + + afr_sh_metadata_finish (frame, this); + return 0; + } + sh->source = source; /* detect changes not visible through pending flags -- JIC */ |