mgmt/glusterd: Various replace brick changes.v3.1.0qa18

Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>

BUG: 1235 (Bug for all pump/migrate commits)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1235

3 files changed, 155 insertions, 41 deletions

diff --git a/cli/src/cli3_1-cops.c b/cli/src/cli3_1-cops.c
index a88d0c6957f..95ce741038a 100644
--- a/cli/src/cli3_1-cops.c
+++ b/cli/src/cli3_1-cops.c
@@ -860,7 +860,7 @@ gf_cli3_1_replace_brick_cbk (struct rpc_req *req, struct iovec *iov,
                         goto out;
                 }
 
-                snprintf (cmd_str, 4096, "gluster volume remove-brick %s %s >/dev/null",
+                snprintf (cmd_str, 4096, "gluster mode script volume remove-brick %s %s >/dev/null",
                           local->u.replace_brick.volname, src_brick);
 
                 ret = system (cmd_str);
diff --git a/xlators/cluster/afr/src/pump.c b/xlators/cluster/afr/src/pump.c
index 5e2c2d43aca..977de07dcd9 100644
--- a/xlators/cluster/afr/src/pump.c
+++ b/xlators/cluster/afr/src/pump.c
@@ -469,12 +469,23 @@ gf_pump_traverse_directory (loc_t *loc)
 
                         entry_loc.ino = iatt.ia_ino;
                         entry_loc.inode->ino = iatt.ia_ino;
+                        memcpy (entry_loc.inode->gfid, iatt.ia_gfid, 16);
 
                         gf_log (this->name, GF_LOG_DEBUG,
                                 "lookup %s => %"PRId64,
                                 entry_loc.path,
                                 iatt.ia_ino);
 
+                        ret = syncop_lookup (this, &entry_loc, NULL,
+                                             &iatt, &xattr_rsp, &parent);
+
+
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "second lookup ret=%d: %s => %"PRId64,
+                                ret,
+                                entry_loc.path,
+                                iatt.ia_ino);
+
                         pump_update_resume_state (this, entry_loc.path);
 
                         if (!IS_ENTRY_CWD(entry->d_name) &&
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index 9e37383f5ff..e710f1179ab 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -1443,11 +1443,15 @@ out:
         return ret;
 }
 
-static const char *client_volfile_str =  "volume client/protocol\n"
-        "type protocol/client\n"
-        "option remote-host %s\n"
-        "option remote-subvolume %s\n"
-        "option remote-port %d\n"
+static const char *client_volfile_str =  "volume mnt-client\n"
+        " type protocol/client\n"
+        " option remote-host %s\n"
+        " option remote-subvolume %s\n"
+        " option remote-port %d\n"
+        "end-volume\n"
+        "volume mnt-wb\n"
+        " type performance/write-behind\n"
+        " subvolumes mnt-client\n"
         "end-volume\n";
 
 static int
@@ -1740,20 +1744,7 @@ rb_do_operation_start (glusterd_volinfo_t *volinfo,
 
         }
 
-        if (!glusterd_is_local_addr (dst_brickinfo->hostname)) {
-                gf_log ("", GF_LOG_NORMAL,
-                        "I AM THE DESTINATION HOST");
-                dst_host = _gf_true;
-                ret = rb_spawn_destination_brick (volinfo, dst_brickinfo);
-                if (ret) {
-                        gf_log ("", GF_LOG_DEBUG,
-                                "Failed to spawn destination brick");
-                        goto out;
-                }
-
-        }
-
-        if (!src_host || !dst_host) {
+        if (!src_host && !dst_host) {
                 gf_log ("", GF_LOG_DEBUG,
                         "Not a source or destination brick");
                 ret = 0;
@@ -1886,7 +1877,7 @@ rb_do_operation_abort (glusterd_volinfo_t *volinfo,
         int ret = -1;
 
         if (!glusterd_is_local_addr (src_brickinfo->hostname)) {
-                gf_log ("", GF_LOG_NORMAL,
+                gf_log ("", GF_LOG_DEBUG,
                         "I AM THE SOURCE HOST");
                 ret = rb_spawn_maintainence_client (volinfo, src_brickinfo);
                 if (ret) {
@@ -1913,16 +1904,6 @@ rb_do_operation_abort (glusterd_volinfo_t *volinfo,
                         goto out;
                 }
         }
-        else if (!glusterd_is_local_addr (dst_brickinfo->hostname)) {
-                gf_log ("", GF_LOG_NORMAL,
-                        "I AM THE DESTINATION HOST");
-                ret = rb_kill_destination_brick (volinfo, dst_brickinfo);
-                if (ret) {
-                        gf_log ("", GF_LOG_DEBUG,
-                                "Failed to kill destination brick");
-                        goto out;
-                }
-        }
 
         ret = 0;
 
@@ -1993,8 +1974,7 @@ out:
 static int
 rb_do_operation_status (glusterd_volinfo_t *volinfo,
                         glusterd_brickinfo_t *src_brickinfo,
-                        glusterd_brickinfo_t *dst_brickinfo,
-                        dict_t *dict)
+                        glusterd_brickinfo_t *dst_brickinfo)
 {
         const char *status       = NULL;
         char       *status_reply = NULL;
@@ -2144,21 +2124,56 @@ glusterd_op_replace_brick (gd1_mgmt_stage_op_req *req)
 
         switch (replace_op) {
         case GF_REPLACE_OP_START:
-                ret = rb_do_operation_start (volinfo, src_brickinfo, dst_brickinfo);
+        {
+                if (!glusterd_is_local_addr (dst_brickinfo->hostname)) {
+                        gf_log ("", GF_LOG_NORMAL,
+                                "I AM THE DESTINATION HOST");
+                        ret = rb_spawn_destination_brick (volinfo, dst_brickinfo);
+                        if (ret) {
+                                gf_log ("", GF_LOG_DEBUG,
+                                        "Failed to spawn destination brick");
+                                goto out;
+                        }
+                }
+        }
                 break;
+
         case GF_REPLACE_OP_COMMIT:
-                ret = rb_do_operation_commit (volinfo, src_brickinfo, dst_brickinfo);
+        {
+                gf_log ("", GF_LOG_DEBUG,
+                        "Received commit - doing nothing");
+        }
                 break;
+
         case GF_REPLACE_OP_PAUSE:
-                ret = rb_do_operation_pause (volinfo, src_brickinfo, dst_brickinfo);
+        {
+                gf_log ("", GF_LOG_DEBUG,
+                        "Recieved pause - doing nothing");
+        }
                 break;
+
         case GF_REPLACE_OP_ABORT:
-                ret = rb_do_operation_abort (volinfo, src_brickinfo, dst_brickinfo);
+        {
+                if (!glusterd_is_local_addr (dst_brickinfo->hostname)) {
+                        gf_log ("", GF_LOG_NORMAL,
+                                "I AM THE DESTINATION HOST");
+                        ret = rb_kill_destination_brick (volinfo, dst_brickinfo);
+                        if (ret) {
+                                gf_log ("", GF_LOG_DEBUG,
+                                        "Failed to kill destination brick");
+                                goto out;
+                        }
+                }
+        }
                 break;
+
         case GF_REPLACE_OP_STATUS:
-                ret = rb_do_operation_status (volinfo, src_brickinfo, dst_brickinfo,
-                                              dict);
+        {
+                gf_log ("", GF_LOG_DEBUG,
+                        "received status - doing nothing");
+        }
                 break;
+
         default:
                 ret = -1;
                 goto out;
@@ -2891,7 +2906,15 @@ out:
 static int
 glusterd_op_ac_rcvd_commit_op_acc (glusterd_op_sm_event_t *event, void *ctx)
 {
-        int                     ret = 0;
+        glusterd_volinfo_t     *volinfo = NULL;
+        int32_t                 op      = 0;
+        dict_t                 *dict    = NULL;
+        char                   *src_brick = NULL;
+        char                   *dst_brick = NULL;
+        char                   *volname   = NULL;
+        glusterd_brickinfo_t   *src_brickinfo = NULL;
+        glusterd_brickinfo_t   *dst_brickinfo = NULL;
+        int                     ret     = 0;
 
         GF_ASSERT (event);
 
@@ -2900,7 +2923,87 @@ glusterd_op_ac_rcvd_commit_op_acc (glusterd_op_sm_event_t *event, void *ctx)
         if (opinfo.pending_count)
                 goto out;
 
-        ret = glusterd_op_sm_inject_event (GD_OP_EVENT_COMMIT_ACC, NULL);
+        dict = glusterd_op_get_ctx (GD_OP_REPLACE_BRICK);
+        if (dict) {
+                gf_log ("", GF_LOG_DEBUG,
+                        "Replace brick operation detected");
+
+                ret = dict_get_int32 (dict, "operation", &op);
+                if (ret) {
+                        gf_log ("", GF_LOG_DEBUG,
+                                "dict_get on operation failed");
+                        goto out;
+                }
+                ret = dict_get_str (dict, "src-brick", &src_brick);
+                if (ret) {
+                        gf_log ("", GF_LOG_ERROR, "Unable to get src brick");
+                        goto out;
+                }
+
+                gf_log ("", GF_LOG_DEBUG,
+                        "src brick=%s", src_brick);
+
+                ret = dict_get_str (dict, "dst-brick", &dst_brick);
+                if (ret) {
+                        gf_log ("", GF_LOG_ERROR, "Unable to get dst brick");
+                        goto out;
+                }
+
+                gf_log ("", GF_LOG_DEBUG,
+                        "dst brick=%s", dst_brick);
+
+                ret = dict_get_str (dict, "volname", &volname);
+
+                if (ret) {
+                        gf_log ("", GF_LOG_ERROR, "Unable to get volume name");
+                        goto out;
+                }
+
+                ret = glusterd_volinfo_find (volname, &volinfo);
+                if (ret) {
+                        gf_log ("", GF_LOG_ERROR, "Unable to allocate memory");
+                        goto out;
+                }
+
+                ret = glusterd_brickinfo_get (src_brick, volinfo, &src_brickinfo);
+                if (ret) {
+                        gf_log ("", GF_LOG_DEBUG, "Unable to get src-brickinfo");
+                        goto out;
+                }
+
+                ret = glusterd_brickinfo_from_brick (dst_brick, &dst_brickinfo);
+                if (ret) {
+                        gf_log ("", GF_LOG_DEBUG, "Unable to get dst-brickinfo");
+                        goto out;
+                }
+
+                switch (op) {
+                case GF_REPLACE_OP_START:
+                        ret = rb_do_operation_start (volinfo, src_brickinfo, dst_brickinfo);
+                        break;
+                case GF_REPLACE_OP_COMMIT:
+                        ret = rb_do_operation_commit (volinfo, src_brickinfo, dst_brickinfo);
+                        break;
+                case GF_REPLACE_OP_PAUSE:
+                        ret = rb_do_operation_pause (volinfo, src_brickinfo, dst_brickinfo);
+                        break;
+                case GF_REPLACE_OP_ABORT:
+                        ret = rb_do_operation_abort (volinfo, src_brickinfo, dst_brickinfo);
+                        break;
+                case GF_REPLACE_OP_STATUS:
+                        ret = rb_do_operation_status (volinfo, src_brickinfo, dst_brickinfo);
+                        break;
+                default:
+                        ret = -1;
+                        goto out;
+                }
+
+        }
+
+        if (ret)
+                ret = glusterd_op_sm_inject_event (GD_OP_EVENT_RCVD_RJT, NULL);
+        else
+                ret = glusterd_op_sm_inject_event (GD_OP_EVENT_COMMIT_ACC, NULL);
 
         gf_log ("", GF_LOG_DEBUG, "Returning %d", ret);