3 files changed, 20 insertions, 0 deletions
diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c
index 17371f41740..66286f40a6a 100644
--- a/xlators/protocol/server/src/server-handshake.c
+++ b/xlators/protocol/server/src/server-handshake.c
@@ -231,6 +231,7 @@ server_setvolume(rpcsvc_request_t *req)
     dict_t *config_params = NULL;
     dict_t *params = NULL;
     char *name = NULL;
+    char *volume_id = NULL;
     char *client_uid = NULL;
     char *clnt_version = NULL;
     xlator_t *xl = NULL;
@@ -408,6 +409,22 @@ server_setvolume(rpcsvc_request_t *req)
         client_name = "unknown";
     }
 
+    ret = dict_get_str_sizen(params, "volume-id", &volume_id);
+    if (!ret && strcmp(xl->graph->volume_id, volume_id)) {
+        ret = dict_set_str(reply, "ERROR",
+                           "Volume-ID different, possible case "
+                           "of same brick re-used in another volume");
+        if (ret < 0)
+            gf_msg_debug(this->name, 0, "failed to set error msg");
+
+        op_ret = -1;
+        op_errno = EINVAL;
+        goto fail;
+    }
+    ret = dict_set_str(reply, "volume-id", tmp->volume_id);
+    if (ret)
+        gf_msg_debug(this->name, 0, "failed to set 'volume-id'");
+
     client = gf_client_get(this, &req->cred, client_uid, subdir_mount);
     if (client == NULL) {
         op_ret = -1;
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index 74453edecd7..1b6f3946c5c 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -1494,6 +1494,8 @@ server_process_child_event(xlator_t *this, int32_t event, void *data,
                 INIT_LIST_HEAD(&tmp->status_list);
                 tmp->name = gf_strdup(victim->name);
                 tmp->child_up = _gf_true;
+                strncpy(tmp->volume_id, victim->graph->volume_id,
+                        GF_UUID_BUF_SIZE);
                 list_add_tail(&tmp->status_list,
                               &conf->child_status->status_list);
             }
diff --git a/xlators/protocol/server/src/server.h b/xlators/protocol/server/src/server.h
index ab05b4ffe6d..821290b62d8 100644
--- a/xlators/protocol/server/src/server.h
+++ b/xlators/protocol/server/src/server.h
@@ -50,6 +50,7 @@ struct _volfile_ctx {
 struct _child_status {
     struct list_head status_list;
     char *name;
+    char volume_id[GF_UUID_BUF_SIZE];
     gf_boolean_t child_up;
 };
 struct server_conf {