From 4abf18c10a0949ce30e3413071778f5f33449b1f Mon Sep 17 00:00:00 2001
From: Ravishankar N <ravishankar@redhat.com>
Date: Mon, 17 Aug 2015 10:29:19 +0000
Subject: [PATCH 295/304] heal: Add check for healing directories in split-brain

Patch in master: http://review.gluster.org/#/c/11937/
Patch in release-3.7: http://review.gluster.org/#/c/12007/

1. Healing using  `bigger-file' option does not make much sense for directories,
hence disallow it and notify the user.
2. Healing using 'source-brick' option for directories performs a conservative
merge. Notify the user about it.

Change-Id: Iafaa7a7ed2ab2c97472cd29efefb318bcfee3dbb
BUG: 1234399
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/56153
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
---
 heal/src/glfs-heal.c |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/heal/src/glfs-heal.c b/heal/src/glfs-heal.c
index bc76518..3b3003e 100644
--- a/heal/src/glfs-heal.c
+++ b/heal/src/glfs-heal.c
@@ -535,6 +535,27 @@ glfsh_gather_heal_info (glfs_t *fs, xlator_t *top_subvol, loc_t *rootloc,
 }
 
 int
+_validate_directory (dict_t *xattr_req, char *file)
+{
+        int heal_op = -1;
+        int ret = 0;
+
+        ret = dict_get_int32 (xattr_req, "heal-op", &heal_op);
+        if (ret)
+                return ret;
+
+        if (heal_op == GF_SHD_OP_SBRAIN_HEAL_FROM_BIGGER_FILE) {
+                printf ("'bigger-file' not a valid option for directories.\n");
+                ret = -1;
+        } else if (heal_op == GF_SHD_OP_SBRAIN_HEAL_FROM_BRICK) {
+                printf ("'source-brick' option used on a directory (%s). "
+                        "Performing conservative merge.\n", file);
+        }
+
+        return ret;
+}
+
+int
 glfsh_heal_splitbrain_file (glfs_t *fs, xlator_t *top_subvol, loc_t *rootloc,
                            char *file, dict_t *xattr_req)
 {
@@ -556,7 +577,7 @@ glfsh_heal_splitbrain_file (glfs_t *fs, xlator_t *top_subvol, loc_t *rootloc,
                 gf_uuid_parse (path, loc.gfid);
                 loc.path = gf_strdup (uuid_utoa (loc.gfid));
                 loc.inode = inode_new (rootloc->inode->table);
-                ret = syncop_lookup (xl, &loc, 0, 0, xattr_req, &xattr_rsp);
+                ret = syncop_lookup (xl, &loc, &iatt, 0, xattr_req, &xattr_rsp);
                 if (ret) {
                         op_errno = -ret;
                         printf ("Lookup failed on %s:%s.\n", file,
@@ -580,6 +601,11 @@ retry:
                 }
         }
 
+        if (iatt.ia_type == IA_IFDIR) {
+                ret = _validate_directory (xattr_req, file);
+                if (ret)
+                        goto out;
+        }
         ret = syncop_getxattr (xl, &loc, &xattr_rsp, GF_AFR_HEAL_SBRAIN,
                                xattr_req, NULL);
         if (ret) {
-- 
1.7.1