cluster/afr: CLI for granular entry heal enablement/disablement

When there are already existing non-granular indices created that are
yet to be healed, if granular-entry-heal option is toggled from 'off' to
'on', AFR self-heal whenever it kicks in, will try to look for granular
indices in 'entry-changes'. Because of the absence of name indices,
granular entry healing logic will fail to heal these directories, and
worse yet unset pending extended attributes with the assumption that
are no entries that need heal.

To get around this, a new CLI is introduced which will invoke glfsheal
program to figure whether at the time an attempt is made to enable
granular entry heal, there are pending heals on the volume OR there
are one or more bricks that are down. If either of them is true, the
command will be failed with the appropriate error.

New CLI: gluster volume heal <VOL> granular-entry-heal {enable,disable}

Change-Id: I1f4fe8162813b9068e198965d94169fee4adc099
BUG: 1370410
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/15747
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>

3 files changed, 40 insertions, 12 deletions

diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
index 38054a94f50..94bda6766f2 100644
--- a/cli/src/cli-cmd-parser.c
+++ b/cli/src/cli-cmd-parser.c
@@ -3821,7 +3821,8 @@ cli_cmd_volume_heal_options_parse (const char **words, int wordcount,
 
         if (wordcount == 5) {
                 if (strcmp (words[3], "info") &&
-                    strcmp (words[3], "statistics")) {
+                    strcmp (words[3], "statistics") &&
+                    strcmp (words[3], "granular-entry-heal")) {
                         ret = -1;
                         goto out;
                 }
@@ -3851,6 +3852,19 @@ cli_cmd_volume_heal_options_parse (const char **words, int wordcount,
                                 goto done;
                         }
                 }
+
+                if (!strcmp (words[3], "granular-entry-heal")) {
+                        if (!strcmp (words[4], "enable")) {
+                                ret = dict_set_int32 (dict, "heal-op",
+                                          GF_SHD_OP_GRANULAR_ENTRY_HEAL_ENABLE);
+                                goto done;
+                        } else if (!strcmp (words[4], "disable")) {
+                                ret = dict_set_int32 (dict, "heal-op",
+                                         GF_SHD_OP_GRANULAR_ENTRY_HEAL_DISABLE);
+                                goto done;
+                        }
+                }
+
                 ret = -1;
                 goto out;
         }
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
index 018814058a8..dc5c6ea5a92 100644
--- a/cli/src/cli-cmd-volume.c
+++ b/cli/src/cli-cmd-volume.c
@@ -2758,7 +2758,8 @@ cli_print_brick_status (cli_volume_status_t *status)
                              (op == GF_SHD_OP_SBRAIN_HEAL_FROM_LATEST_MTIME) ||\
                              (op == GF_SHD_OP_SBRAIN_HEAL_FROM_BRICK) ||      \
                              (op == GF_SHD_OP_INDEX_SUMMARY) ||               \
-                             (op == GF_SHD_OP_SPLIT_BRAIN_FILES))
+                             (op == GF_SHD_OP_SPLIT_BRAIN_FILES) ||           \
+                             (op == GF_SHD_OP_GRANULAR_ENTRY_HEAL_ENABLE))
 
 int
 cli_launch_glfs_heal (int heal_op, dict_t *options)
@@ -2807,6 +2808,10 @@ cli_launch_glfs_heal (int heal_op, dict_t *options)
                         runner_add_args (&runner, "xml", NULL);
                 }
                 break;
+        case GF_SHD_OP_GRANULAR_ENTRY_HEAL_ENABLE:
+        case GF_SHD_OP_GRANULAR_ENTRY_HEAL_DISABLE:
+                runner_add_args (&runner, "granular-entry-heal-op", NULL);
+                break;
         default:
                 ret = -1;
         }
@@ -2818,11 +2823,11 @@ cli_launch_glfs_heal (int heal_op, dict_t *options)
                 printf ("%s", out);
         }
         ret = runner_end (&runner);
-        ret = WEXITSTATUS (ret);
 
 out:
         return ret;
 }
+
 int
 cli_cmd_volume_heal_cbk (struct cli_state *state, struct cli_cmd_word *word,
                           const char **words, int wordcount)
@@ -2859,19 +2864,19 @@ cli_cmd_volume_heal_cbk (struct cli_state *state, struct cli_cmd_word *word,
                 goto out;
         if (NEEDS_GLFS_HEAL (heal_op)) {
                 ret = cli_launch_glfs_heal (heal_op, options);
-                if (ret == -1)
+                if (ret < 0)
+                        goto out;
+                if (heal_op != GF_SHD_OP_GRANULAR_ENTRY_HEAL_ENABLE)
                         goto out;
         }
-        else {
-                proc = &cli_rpc_prog->proctable[GLUSTER_CLI_HEAL_VOLUME];
 
-                CLI_LOCAL_INIT (local, words, frame, options);
+        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_HEAL_VOLUME];
 
-                if (proc->fn) {
-                        ret = proc->fn (frame, THIS, options);
-                }
-        }
+        CLI_LOCAL_INIT (local, words, frame, options);
 
+        if (proc->fn) {
+                ret = proc->fn (frame, THIS, options);
+        }
 out:
         if (ret) {
                 cli_cmd_sent_status_get (&sent);
@@ -3280,7 +3285,8 @@ struct cli_cmd volume_cmds[] = {
           "statistics [heal-count [replica <HOSTNAME:BRICKNAME>]] |"
           "info [healed | heal-failed | split-brain] |"
           "split-brain {bigger-file <FILE> | latest-mtime <FILE> |"
-                       "source-brick <HOSTNAME:BRICKNAME> [<FILE>]}]",
+                       "source-brick <HOSTNAME:BRICKNAME> [<FILE>]} |"
+          "granular-entry-heal {enable | disable}]",
           cli_cmd_volume_heal_cbk,
           "self-heal commands on volume specified by <VOLNAME>"},
 
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index 1f641f4a2fd..c6801e6a746 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -8961,6 +8961,14 @@ gf_cli_heal_volume_cbk (struct rpc_req *req, struct iovec *iov,
                 operation   = "";
                 heal_op_str = "Disable heal";
                 break;
+        case    GF_SHD_OP_GRANULAR_ENTRY_HEAL_ENABLE:
+                operation   = "";
+                heal_op_str = "Enable granular entry heal";
+                break;
+        case    GF_SHD_OP_GRANULAR_ENTRY_HEAL_DISABLE:
+                operation   = "";
+                heal_op_str = "Disable granular entry heal";
+                break;
         }
 
         if (rsp.op_ret) {