mgmt/glusterd: prevent detach of peer with its bricks existing in cluster

Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>

BUG: 1681 ()
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1681

1 files changed, 35 insertions, 91 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index af4b3130648..5de695300fc 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -55,94 +55,6 @@
 #include "common-utils.h"
 
 static int
-glusterd_friend_find_by_hostname (const char *hoststr,
-                                  glusterd_peerinfo_t  **peerinfo)
-{
-        int                     ret = -1;
-        glusterd_conf_t         *priv = NULL;
-        glusterd_peerinfo_t     *entry = NULL;
-        glusterd_peer_hostname_t *name = NULL;
-        struct addrinfo         *addr = NULL;
-        struct addrinfo         *p = NULL;
-        char                    *host = NULL;
-        struct sockaddr_in6     *s6 = NULL;
-        struct sockaddr_in      *s4 = NULL;
-        struct in_addr          *in_addr = NULL;
-        char                    hname[1024] = {0,};
-
-        GF_ASSERT (hoststr);
-        GF_ASSERT (peerinfo);
-
-        *peerinfo = NULL;
-        priv    = THIS->private;
-
-        GF_ASSERT (priv);
-
-        list_for_each_entry (entry, &priv->peers, uuid_list) {
-                list_for_each_entry (name, &entry->hostnames, hostname_list) {
-                        if (!strncmp (name->hostname, hoststr,
-                                        1024)) {
-
-                        gf_log ("glusterd", GF_LOG_NORMAL,
-                                 "Friend %s found.. state: %d", hoststr,
-                                  entry->state.state);
-                        *peerinfo = entry;
-                        return 0;
-                        }
-                }
-        }
-
-        ret = getaddrinfo(hoststr, NULL, NULL, &addr);
-        if (ret != 0) {
-                gf_log ("", GF_LOG_ERROR, "error in getaddrinfo: %s\n",
-                        gai_strerror(ret));
-                goto out;
-        }
-
-        for (p = addr; p != NULL; p = p->ai_next) {
-                switch (p->ai_family) {
-                        case AF_INET:
-                                s4 = (struct sockaddr_in *) p->ai_addr;
-                                in_addr = &s4->sin_addr;
-                                break;
-                        case AF_INET6:
-                                s6 = (struct sockaddr_in6 *) p->ai_addr;
-                                in_addr =(struct in_addr *) &s6->sin6_addr;
-                                break;
-                       default: ret = -1;
-                                goto out;
-                }
-                host = inet_ntoa(*in_addr);
-
-                ret = getnameinfo (p->ai_addr, p->ai_addrlen, hname,
-                                   1024, NULL, 0, 0);
-                if (ret)
-                        goto out;
-
-                list_for_each_entry (entry, &priv->peers, uuid_list) {
-                        list_for_each_entry (name, &entry->hostnames,
-                                             hostname_list) {
-                                if (!strncmp (name->hostname, host,
-                                    1024) || !strncmp (name->hostname,hname,
-                                    1024)) {
-                                        gf_log ("glusterd", GF_LOG_NORMAL,
-                                                "Friend %s found.. state: %d", 
-                                                hoststr, entry->state.state);
-                                        *peerinfo = entry;
-                                        freeaddrinfo (addr);
-                                        return 0;
-                                }
-                        } 
-                } 
-        }
-
-out:
-        if (addr)
-                freeaddrinfo (addr); 
-        return -1;
-}
-
-static int
 glusterd_friend_find_by_uuid (uuid_t uuid,
                               glusterd_peerinfo_t  **peerinfo)
 {
@@ -642,7 +554,15 @@ glusterd_handle_cli_deprobe (rpcsvc_request_t *req)
 {
         int32_t                         ret = -1;
         gf1_cli_probe_req               cli_req = {0,};
+        uuid_t                          uuid = {0};
+        int                             op_errno = 0;
+        xlator_t                        *this = NULL;
+        glusterd_conf_t                 *priv = NULL;
 
+        this = THIS;
+        GF_ASSERT (this);
+        priv = this->private;
+        GF_ASSERT (priv);
         GF_ASSERT (req);
 
         if (!gf_xdr_to_cli_probe_req (req->msg[0], &cli_req)) {
@@ -653,12 +573,35 @@ glusterd_handle_cli_deprobe (rpcsvc_request_t *req)
 
         gf_log ("glusterd", GF_LOG_NORMAL, "Received CLI deprobe req");
 
+        ret = glusterd_hostname_to_uuid (cli_req.hostname, uuid);
+        if (ret) {
+                op_errno = GF_DEPROBE_NOT_FRIEND;
+                goto out;
+        }
 
-        ret = glusterd_deprobe_begin (req, cli_req.hostname, cli_req.port);
+        if (!uuid_compare (uuid, priv->uuid)) {
+                op_errno = GF_DEPROBE_LOCALHOST;
+                ret = -1;
+                goto out;
+        }
+
+        ret = glusterd_all_volume_cond_check (glusterd_friend_brick_belongs,
+                                              -1, &uuid);
+        if (ret) {
+                op_errno = GF_DEPROBE_BRICK_EXIST;
+                goto out;
+        }
+
+        ret = glusterd_deprobe_begin (req, cli_req.hostname,
+                                      cli_req.port, uuid);
 
         gf_cmd_log ("peer deprobe", "on host %s:%d %s", cli_req.hostname,
                     cli_req.port, (ret) ? "FAILED" : "SUCCESS");
 out:
+        if (ret) {
+                ret = glusterd_xfer_cli_deprobe_resp (req, ret, op_errno,
+                                                      cli_req.hostname);
+        }
         if (cli_req.hostname)
                 free (cli_req.hostname);//malloced by xdr
         return ret;
@@ -2784,7 +2727,8 @@ glusterd_probe_begin (rpcsvc_request_t *req, const char *hoststr, int port)
 }
 
 int
-glusterd_deprobe_begin (rpcsvc_request_t *req, const char *hoststr, int port)
+glusterd_deprobe_begin (rpcsvc_request_t *req, const char *hoststr, int port,
+                        uuid_t uuid)
 {
         int                             ret = -1;
         glusterd_peerinfo_t             *peerinfo = NULL;
@@ -2794,7 +2738,7 @@ glusterd_deprobe_begin (rpcsvc_request_t *req, const char *hoststr, int port)
         GF_ASSERT (hoststr);
         GF_ASSERT (req);
 
-        ret = glusterd_friend_find (NULL, (char *)hoststr, &peerinfo);
+        ret = glusterd_friend_find (uuid, (char *)hoststr, &peerinfo);
 
         if (ret) {
                 gf_log ("glusterd", GF_LOG_NORMAL, "Unable to find peerinfo"