diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2015-12-03 14:54:32 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2015-12-29 01:09:03 -0800 |
| commit | 8a9a532fd141a5456fea9729abf4273bd653cc39 (patch) | |
| tree | fdc4ab71482b672f119ccaffda6114002a2856a9 /xlators/mgmt/glusterd/src/glusterd-handler.c | |
| parent | 101243860bca1bbda8a03ab76f6753ecc10799ed (diff) | |
glusterd: Disallow peer with existing volumes to be probed in cluster
Backport of http://review.gluster.org/12864
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: 1288963
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>
Reviewed-on: http://review.gluster.org/12888
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-handler.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index 1296267578a..1e7affd51a1 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -3830,8 +3830,9 @@ set_probe_error_str (int op_ret, int op_errno, char *op_errstr, char *errstr, } else { switch (op_errno) { case GF_PROBE_ANOTHER_CLUSTER: - snprintf (errstr, len, "%s is already part of " - "another cluster", hostname); + snprintf (errstr, len, "%s is either already " + "part of another cluster or having " + "volumes configured", hostname); break; case GF_PROBE_VOLUME_CONFLICT: |