rebalance: bring in two stagesv3.1.0qa37

step 1: fix layout (quick pass, so the newly added brick can
        participate in distribute's entry creations)

step 2: migrate data (do the actual rebalance)

Its advised to run rebalance after add-brick, and let it complete
at-least 'step 1', so things will be smooth with distribute.

Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>

BUG: 971 (dynamic volume management)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971

3 files changed, 140 insertions, 68 deletions

diff --git a/cli/src/cli3_1-cops.c b/cli/src/cli3_1-cops.c
index ecf454cbfd0..1538a4c6703 100644
--- a/cli/src/cli3_1-cops.c
+++ b/cli/src/cli3_1-cops.c
@@ -681,15 +681,20 @@ gf_cli3_1_defrag_volume_cbk (struct rpc_req *req, struct iovec *iov,
                         if (rsp.op_errno == 0)
                                 status = "not started";
                         if (rsp.op_errno == 1)
-                                status = "in progress";
+                                status = "step 1: layout fix in progress";
                         if (rsp.op_errno == 2)
-                                status = "stopped";
+                                status = "step 2: data migration in progress";
                         if (rsp.op_errno == 3)
-                                status = "completed";
+                                status = "stopped";
                         if (rsp.op_errno == 4)
+                                status = "completed";
+                        if (rsp.op_errno == 5)
                                 status = "failed";
 
-                        if (rsp.files) {
+                        if (rsp.files && (rsp.op_errno == 1)) {
+                                cli_out ("rebalance %s: fixed layout %"PRId64,
+                                         status, rsp.files);
+                        } else if (rsp.files) {
                                 cli_out ("rebalance %s: rebalanced %"PRId64
                                          " files of size %"PRId64" (total files"
                                          " scanned %"PRId64")", status,
diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
index 1401b4f2786..6583dcb0d84 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
@@ -37,10 +37,11 @@
 #include "glusterd-utils.h"
 #include "glusterd-store.h"
 
+#include "syscall.h"
 #include "cli1.h"
 
 int
-glusterd_check_and_rebalance (glusterd_volinfo_t *volinfo, char *dir)
+gf_glusterd_rebalance_move_data (glusterd_volinfo_t *volinfo, const char *dir)
 {
         int                     ret                = -1;
         int                     dst_fd             = -1;
@@ -52,14 +53,12 @@ glusterd_check_and_rebalance (glusterd_volinfo_t *volinfo, char *dir)
         struct stat             new_stbuf          = {0,};
         char                    full_path[1024]    = {0,};
         char                    tmp_filename[1024] = {0,};
-        char                    value[128]         = {0,};
 
-        defrag = volinfo->defrag;
-        if (!defrag)
+        if (!volinfo->defrag)
                 goto out;
 
+        defrag = volinfo->defrag;
 
-        /* Fix files at this level */
         fd = opendir (dir);
         if (!fd)
                 goto out;
@@ -76,75 +75,70 @@ glusterd_check_and_rebalance (glusterd_volinfo_t *volinfo, char *dir)
                 if (ret == -1)
                         continue;
 
-                if (S_ISDIR (stbuf.st_mode)) {
-                        /* Fix the layout of the directory */
-                        getxattr (full_path, "trusted.distribute.fix.layout",
-                                  &value, 128);
+                if (S_ISREG (stbuf.st_mode))
+                        defrag->num_files_lookedup += 1;
+
+                if (!(S_ISREG (stbuf.st_mode) &&
+                      ((stbuf.st_mode & 01000) == 01000)))
+                        continue;
+
+                /* If its a regular file, and sticky bit is set, we need to
+                   rebalance that */
+                snprintf (tmp_filename, 1024, "%s/.%s.gfs%llu", dir,
+                          entry->d_name,
+                          (unsigned long long)stbuf.st_size);
+
+                dst_fd = creat (tmp_filename, (stbuf.st_mode & ~01000));
+                if (dst_fd == -1)
+                        continue;
+
+                src_fd = open (full_path, O_RDONLY);
+                if (src_fd == -1) {
+                        close (dst_fd);
                         continue;
                 }
-                if (S_ISREG (stbuf.st_mode) && ((stbuf.st_mode & 01000) == 01000)) {
-                        /* TODO: run the defrag */
-                        snprintf (tmp_filename, 1024, "%s/.%s.gfs%llu", dir,
-                                  entry->d_name,
-                                  (unsigned long long)stbuf.st_size);
-
-                        dst_fd = creat (tmp_filename, (stbuf.st_mode & ~01000));
-                        if (dst_fd == -1)
-                                continue;
-
-                        src_fd = open (full_path, O_RDONLY);
-                        if (src_fd == -1) {
+
+                while (1) {
+                        ret = read (src_fd, defrag->databuf, 131072);
+                        if (!ret || (ret < 0)) {
                                 close (dst_fd);
-                                continue;
+                                close (src_fd);
+                                break;
                         }
-
-                        while (1) {
-                                ret = read (src_fd, defrag->databuf, 131072);
-                                if (!ret || (ret < 0)) {
-                                        close (dst_fd);
-                                        close (src_fd);
-                                        break;
-                                }
-                                ret = write (dst_fd, defrag->databuf, ret);
-                                if (ret < 0) {
-                                        close (dst_fd);
-                                        close (src_fd);
-                                        break;
-                                }
+                        ret = write (dst_fd, defrag->databuf, ret);
+                        if (ret < 0) {
+                                close (dst_fd);
+                                close (src_fd);
+                                break;
                         }
+                }
 
-                        ret = stat (full_path, &new_stbuf);
-                        if (ret < 0)
-                                continue;
-                        if (new_stbuf.st_mtime != stbuf.st_mtime)
-                                continue;
-
-                        ret = rename (tmp_filename, full_path);
-                        if (ret != -1) {
-                                LOCK (&defrag->lock);
-                                {
-                                        defrag->total_files += 1;
-                                        defrag->total_data += stbuf.st_size;
-                                }
-                                UNLOCK (&defrag->lock);
-                        }
-                } else {
+                ret = stat (full_path, &new_stbuf);
+                if (ret < 0)
+                        continue;
+                /* No need to rebalance, if there is some
+                   activity on source file */
+                if (new_stbuf.st_mtime != stbuf.st_mtime)
+                        continue;
+
+                ret = rename (tmp_filename, full_path);
+                if (ret != -1) {
                         LOCK (&defrag->lock);
                         {
-                                if (S_ISREG (stbuf.st_mode))
-                                        defrag->num_files_lookedup += 1;
+                                defrag->total_files += 1;
+                                defrag->total_data += stbuf.st_size;
                         }
                         UNLOCK (&defrag->lock);
                 }
 
                 if (volinfo->defrag_status == GF_DEFRAG_STATUS_STOPED) {
                         closedir (fd);
+                        ret = -1;
                         goto out;
                 }
         }
         closedir (fd);
 
-        /* Iterate over directories */
         fd = opendir (dir);
         if (!fd)
                 goto out;
@@ -161,18 +155,77 @@ glusterd_check_and_rebalance (glusterd_volinfo_t *volinfo, char *dir)
                 if (ret == -1)
                         continue;
 
+                if (!S_ISDIR (stbuf.st_mode))
+                        continue;
+
+                ret = gf_glusterd_rebalance_move_data (volinfo,
+                                                       full_path);
+                if (ret)
+                        break;
+        }
+        closedir (fd);
+
+        if (!entry)
+                ret = 0;
+out:
+        return ret;
+}
+
+int
+gf_glusterd_rebalance_fix_layout (glusterd_volinfo_t *volinfo, const char *dir)
+{
+        int            ret             = -1;
+        char           value[128]      = {0,};
+        char           full_path[1024] = {0,};
+        struct stat    stbuf           = {0,};
+        DIR           *fd              = NULL;
+        struct dirent *entry           = NULL;
+
+        if (!volinfo->defrag)
+                goto out;
+
+        fd = opendir (dir);
+        if (!fd)
+                goto out;
+
+        while ((entry = readdir (fd))) {
+                if (!entry)
+                        break;
+
+                if (!strcmp (entry->d_name, ".") || !strcmp (entry->d_name, ".."))
+                        continue;
+
+                snprintf (full_path, 1024, "%s/%s", dir, entry->d_name);
+
+                ret = stat (full_path, &stbuf);
+                if (ret == -1)
+                        continue;
+
                 if (S_ISDIR (stbuf.st_mode)) {
-                        /* iterate in subdirectories */
-                        ret = glusterd_check_and_rebalance (volinfo, full_path);
+                        /* Fix the layout of the directory */
+                        sys_lgetxattr (full_path, "trusted.distribute.fix.layout",
+                                       &value, 128);
+
+                        volinfo->defrag->total_files += 1;
+
+                        /* Traverse into subdirectory */
+                        ret = gf_glusterd_rebalance_fix_layout (volinfo,
+                                                                full_path);
                         if (ret)
                                 break;
                 }
-        }
 
+                if (volinfo->defrag_status == GF_DEFRAG_STATUS_STOPED) {
+                        closedir (fd);
+                        ret = -1;
+                        goto out;
+                }
+        }
         closedir (fd);
 
         if (!entry)
                 ret = 0;
+
 out:
         return ret;
 }
@@ -207,19 +260,33 @@ glusterd_defrag_start (void *data)
         }
 
         /* Fix the root ('/') first */
-        getxattr (defrag->mount, "trusted.distribute.fix.layout", &value, 128);
+        sys_lgetxattr (defrag->mount, "trusted.distribute.fix.layout",
+                       &value, 128);
+
+        /* root's layout got fixed */
+        defrag->total_files = 1;
+
+        /* Step 1: Fix layout of all the directories */
+        ret = gf_glusterd_rebalance_fix_layout (volinfo, defrag->mount);
+        if (ret)
+                goto out;
+
+        /* Completed first step */
+        volinfo->defrag_status = GF_DEFRAG_STATUS_LAYOUT_FIX_COMPLETE;
 
-        ret = glusterd_check_and_rebalance (volinfo, defrag->mount);
+        /* It was used by number of layout fixes on directories */
+        defrag->total_files = 0;
 
-        /* TODO: This should run in a thread, and finish the thread when
-           the task is complete. While defrag is running, keep updating
-           files */
+        /* Step 2: Iterate over directories to move data */
+        ret = gf_glusterd_rebalance_move_data (volinfo, defrag->mount);
 
+        /* Completed whole process */
         volinfo->defrag_status   = GF_DEFRAG_STATUS_COMPLETE;
         volinfo->rebalance_files = defrag->total_files;
         volinfo->rebalance_data  = defrag->total_data;
         volinfo->lookedup_files  = defrag->num_files_lookedup;
 out:
+        volinfo->defrag = NULL;
         if (defrag) {
                 gf_log ("rebalance", GF_LOG_NORMAL, "rebalance on %s complete",
                         defrag->mount);
@@ -229,7 +296,6 @@ out:
                 LOCK_DESTROY (&defrag->lock);
                 GF_FREE (defrag);
         }
-        volinfo->defrag = NULL;
 
         return NULL;
 }
diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h
index bc319cd06d5..5470e7774e3 100644
--- a/xlators/mgmt/glusterd/src/glusterd.h
+++ b/xlators/mgmt/glusterd/src/glusterd.h
@@ -125,6 +125,7 @@ struct gf_defrag_brickinfo_ {
 typedef enum gf_defrag_status_ {
         GF_DEFRAG_STATUS_NOT_STARTED,
         GF_DEFRAG_STATUS_STARTED,
+        GF_DEFRAG_STATUS_LAYOUT_FIX_COMPLETE,
         GF_DEFRAG_STATUS_STOPED,
         GF_DEFRAG_STATUS_COMPLETE,
         GF_DEFRAG_STATUS_FAILED,