cluster/afr: trigger self-heals even when they are set to off.

When attempt-self-heal is set to true, trigger data/metadata/entry
self-heals even when they are disabled. This is useful for
gluster volume heal info to report them even when metadata-self-heal
entry-self-heal, data-self-heal are set to off.

Change-Id: Idc3f0d5d049c875b4f975248fef56ea2238da47c
BUG: 1039544
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/7480
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>

6 files changed, 102 insertions, 36 deletions

diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index 4b39ff6039d..7dafa0529fa 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -1411,19 +1411,90 @@ afr_detect_self_heal_by_lookup_status (afr_local_t *local, xlator_t *this)
 }
 
 gf_boolean_t
-afr_can_self_heal_proceed (afr_self_heal_t *sh, afr_private_t *priv)
+afr_can_start_missing_entry_gfid_self_heal (afr_local_t *local,
+                                            afr_private_t *priv)
 {
-        GF_ASSERT (sh);
-        GF_ASSERT (priv);
+        if (!local)
+                goto out;
+        //attempt self heal is only for data/metadata/entry
+        if (local->self_heal.do_gfid_self_heal ||
+            local->self_heal.do_missing_entry_self_heal)
+                return _gf_true;
+out:
+        return _gf_false;
+}
+
+gf_boolean_t
+afr_can_start_entry_self_heal (afr_local_t *local, afr_private_t *priv)
+{
+        if (!local)
+                goto out;
+        //force_confirm_spb is not checked here because directory split-brains
+        //are not reported at the moment.
+        if (local->self_heal.do_entry_self_heal) {
+                if (local->attempt_self_heal || priv->entry_self_heal)
+                        return _gf_true;
+        }
+out:
+        return _gf_false;
+}
+
+gf_boolean_t
+afr_can_start_data_self_heal (afr_local_t *local, afr_private_t *priv)
+{
+        if (!local)
+                goto out;
+
+        if (local->self_heal.force_confirm_spb)
+                return _gf_true;
+
+        if (local->self_heal.do_data_self_heal) {
+                if (local->attempt_self_heal ||
+                    afr_data_self_heal_enabled (priv->data_self_heal))
+                        return _gf_true;
+        }
+out:
+        return _gf_false;
+}
 
-        if (sh->force_confirm_spb)
+gf_boolean_t
+afr_can_start_metadata_self_heal (afr_local_t *local, afr_private_t *priv)
+{
+        if (!local)
+                goto out;
+        if (local->self_heal.force_confirm_spb)
                 return _gf_true;
-        return (sh->do_gfid_self_heal
-                || sh->do_missing_entry_self_heal
-                || (afr_data_self_heal_enabled (priv->data_self_heal) &&
-                    sh->do_data_self_heal)
-                || (priv->metadata_self_heal && sh->do_metadata_self_heal)
-                || (priv->entry_self_heal && sh->do_entry_self_heal));
+
+        if (local->self_heal.do_metadata_self_heal) {
+                if (local->attempt_self_heal || priv->metadata_self_heal)
+                        return _gf_true;
+        }
+out:
+        return _gf_false;
+}
+
+gf_boolean_t
+afr_can_self_heal_proceed (afr_local_t *local, afr_private_t *priv)
+{
+        if (!local)
+                goto out;
+
+        if (local->self_heal.force_confirm_spb)
+                return _gf_true;
+
+        if (afr_can_start_missing_entry_gfid_self_heal (local, priv))
+                return _gf_true;
+
+        if (afr_can_start_entry_self_heal (local, priv))
+                return _gf_true;
+
+        if (afr_can_start_data_self_heal (local, priv))
+                return _gf_true;
+
+        if (afr_can_start_metadata_self_heal (local, priv))
+                return _gf_true;
+out:
+        return _gf_false;
 }
 
 afr_transaction_type
@@ -1840,7 +1911,7 @@ afr_lookup_perform_self_heal (call_frame_t *frame, xlator_t *this,
         }
 
         afr_lookup_set_self_heal_params (local, this);
-        if (afr_can_self_heal_proceed (&local->self_heal, priv)) {
+        if (afr_can_self_heal_proceed (local, priv)) {
                 if  (afr_is_transaction_running (local) &&
                      (!local->attempt_self_heal))
                         goto out;
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c
index 6f82761b33d..ab9e44b41e0 100644
--- a/xlators/cluster/afr/src/afr-self-heal-common.c
+++ b/xlators/cluster/afr/src/afr-self-heal-common.c
@@ -2307,6 +2307,7 @@ afr_self_heal_local_init (afr_local_t *l, xlator_t *this)
                                 this->name, priv->child_count);
         if (ret)
                 goto out;
+        lc->attempt_self_heal = l->attempt_self_heal;
 
 out:
         if (ret) {
@@ -2474,7 +2475,7 @@ afr_self_heal (call_frame_t *frame, xlator_t *this, inode_t *inode)
         sh->sh_type_in_action = AFR_SELF_HEAL_INVALID;
 
         FRAME_SU_DO (sh_frame, afr_local_t);
-        if (sh->do_missing_entry_self_heal || sh->do_gfid_self_heal) {
+        if (afr_can_start_missing_entry_gfid_self_heal (local, priv)) {
                 afr_self_heal_missing_entries (sh_frame, this);
         } else {
                 loc = &sh_local->loc;
diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c
index e5ca84292fa..5c53f6a6a06 100644
--- a/xlators/cluster/afr/src/afr-self-heal-data.c
+++ b/xlators/cluster/afr/src/afr-self-heal-data.c
@@ -1704,17 +1704,6 @@ afr_sh_non_reg_lock_success (call_frame_t *frame, xlator_t *this)
         return 0;
 }
 
-gf_boolean_t
-afr_can_start_data_self_heal (afr_self_heal_t *sh, afr_private_t *priv)
-{
-        if (sh->force_confirm_spb)
-                return _gf_true;
-        if (sh->do_data_self_heal &&
-            afr_data_self_heal_enabled (priv->data_self_heal))
-                return _gf_true;
-        return _gf_false;
-}
-
 int
 afr_self_heal_data (call_frame_t *frame, xlator_t *this)
 {
@@ -1728,7 +1717,7 @@ afr_self_heal_data (call_frame_t *frame, xlator_t *this)
 
         sh->sh_type_in_action = AFR_SELF_HEAL_DATA;
 
-        if (afr_can_start_data_self_heal (sh, priv)) {
+        if (afr_can_start_data_self_heal (local, priv)) {
                 afr_set_self_heal_status (sh, AFR_SELF_HEAL_STARTED);
                 ret = afr_inodelk_init (&local->internal_lock.inodelk[1],
                                         priv->sh_domain, priv->child_count);
diff --git a/xlators/cluster/afr/src/afr-self-heal-entry.c b/xlators/cluster/afr/src/afr-self-heal-entry.c
index 8359079cea4..1ea957ad042 100644
--- a/xlators/cluster/afr/src/afr-self-heal-entry.c
+++ b/xlators/cluster/afr/src/afr-self-heal-entry.c
@@ -2396,7 +2396,7 @@ afr_self_heal_entry (call_frame_t *frame, xlator_t *this)
 
         sh->sh_type_in_action = AFR_SELF_HEAL_ENTRY;
 
-        if (local->self_heal.do_entry_self_heal && priv->entry_self_heal) {
+        if (afr_can_start_entry_self_heal (local, priv)) {
                 afr_set_self_heal_status (sh, AFR_SELF_HEAL_STARTED);
                 afr_sh_entrylk (frame, this, &local->loc, NULL,
                                 afr_sh_post_nonblocking_entry_cbk);
diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c
index e26d3580e51..7abd852de6c 100644
--- a/xlators/cluster/afr/src/afr-self-heal-metadata.c
+++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c
@@ -688,8 +688,10 @@ afr_sh_metadata_post_nonblocking_inodelk_cbk (call_frame_t *frame,
 {
         afr_internal_lock_t *int_lock = NULL;
         afr_local_t         *local    = NULL;
+        afr_self_heal_t     *sh       = NULL;
 
         local    = frame->local;
+        sh       = &local->self_heal;
         int_lock = &local->internal_lock;
 
         if (int_lock->lock_op_ret < 0) {
@@ -697,6 +699,7 @@ afr_sh_metadata_post_nonblocking_inodelk_cbk (call_frame_t *frame,
                         "inodelks failed for %s.", local->loc.path);
                 gf_log (this->name, GF_LOG_DEBUG, "Metadata self-heal "
                         "failed for %s.", local->loc.path);
+                afr_set_self_heal_status (sh, AFR_SELF_HEAL_FAILED);
                 afr_sh_metadata_done (frame, this);
         } else {
 
@@ -740,16 +743,6 @@ afr_sh_metadata_lock (call_frame_t *frame, xlator_t *this)
         return 0;
 }
 
-gf_boolean_t
-afr_can_start_metadata_self_heal (afr_self_heal_t *sh, afr_private_t *priv)
-{
-        if (sh->force_confirm_spb)
-                return _gf_true;
-        if (sh->do_metadata_self_heal && priv->metadata_self_heal)
-                return _gf_true;
-        return _gf_false;
-}
-
 int
 afr_self_heal_metadata (call_frame_t *frame, xlator_t *this)
 {
@@ -761,7 +754,7 @@ afr_self_heal_metadata (call_frame_t *frame, xlator_t *this)
         sh = &local->self_heal;
         sh->sh_type_in_action = AFR_SELF_HEAL_METADATA;
 
-        if (afr_can_start_metadata_self_heal (sh, priv)) {
+        if (afr_can_start_metadata_self_heal (local, priv)) {
                 afr_set_self_heal_status (sh, AFR_SELF_HEAL_STARTED);
                 afr_sh_metadata_lock (frame, this);
         } else {
diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h
index 676bd9b9466..ad8964ccbaa 100644
--- a/xlators/cluster/afr/src/afr.h
+++ b/xlators/cluster/afr/src/afr.h
@@ -1216,4 +1216,16 @@ afr_handle_open_fd_count (call_frame_t *frame, xlator_t *this);
 afr_inode_ctx_t*
 afr_inode_ctx_get (inode_t *inode, xlator_t *this);
 
+gf_boolean_t
+afr_can_start_missing_entry_gfid_self_heal (afr_local_t *local,
+                                            afr_private_t *priv);
+
+gf_boolean_t
+afr_can_start_entry_self_heal (afr_local_t *local, afr_private_t *priv);
+
+gf_boolean_t
+afr_can_start_data_self_heal (afr_local_t *local, afr_private_t *priv);
+
+gf_boolean_t
+afr_can_start_metadata_self_heal (afr_local_t *local, afr_private_t *priv);
 #endif /* __AFR_H__ */