diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2015-12-03 14:54:32 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2015-12-06 22:23:08 -0800 |
| commit | b1d047caeacbcfac4222759af9d5936b7cfd1d7c (patch) | |
| tree | 1d0caa2536e594a586b61739ea490a4f4775b0b2 /xlators/mgmt/glusterd/src/glusterd-handshake.c | |
| parent | 05b510bb893761864d3830eb781210445056a6f9 (diff) | |
glusterd: Disallow peer with existing volumes to be probed in cluster
As of now we do allow peer to get added in the trusted storage pool even if it
has a volume configured. This is definitely not a supported configuration and
can lead to issues as we never claim to support merging clusters. A single node
running a standalone volume can be considered as a cluster.
Change-Id: Id0cf42d6e5f20d6bfdb7ee19d860eee67c7c45be
BUG: 1287992
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: http://review.gluster.org/12864
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Kaushal M <kaushal@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-handshake.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handshake.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c index 755b7aab555..756e48965c2 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handshake.c +++ b/xlators/mgmt/glusterd/src/glusterd-handshake.c @@ -987,7 +987,7 @@ out: /* Validate if glusterd can serve the management handshake request * * Requests are allowed if, - * - glusterd has no peers, or + * - glusterd has no peers & no volumes, or * - the request came from a known peer * A known peer is identified using the following steps * - the dict is checked for a peer uuid, which if present is matched with the @@ -1007,7 +1007,7 @@ gd_validate_mgmt_hndsk_req (rpcsvc_request_t *req, dict_t *dict) this = THIS; GF_ASSERT (this); - if (!glusterd_have_peers ()) + if (!glusterd_have_peers () && !glusterd_have_volumes ()) return _gf_true; ret = dict_get_str (dict, GD_PEER_ID_KEY, &uuid_str); |