summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaushal M <kaushal@redhat.com>2014-06-19 15:21:33 +0530
committerKrishnan Parthasarathi <kparthas@redhat.com>2014-06-19 23:01:54 -0700
commit3fe1a14a82f3894e6b9e9d3004a185c48ea4bf6b (patch)
tree2851378fbdc8de7c9e078f077f50d1f4e6ea88b6
parent2783fbed2a6a8481eadbab8ca5ad03513f7f54f4 (diff)
glusterd: Check mount_dir for own bricks only during start
During the start volume commit op brickinfo->mount_dir was being checked for all bricks by glusterd. This could lead to failures starting the volumes which were carried forward on upgrade. Change-Id: If3d3ee4b2b9f68341ff4422dd90faf32bc3e898f BUG: 1111124 Signed-off-by: Kaushal M <kaushal@redhat.com> Reviewed-on: http://review.gluster.org/8113 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Rajesh Joseph <rjoseph@redhat.com> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-ops.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
index 76db3425dbe..aa9805092fa 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
@@ -1942,6 +1942,10 @@ glusterd_op_start_volume (dict_t *dict, char **op_errstr)
if (conf->op_version >= GD_OP_VERSION_3_6_0) {
list_for_each_entry (brickinfo, &volinfo->bricks, brick_list) {
brick_count++;
+ /* Don't check bricks that are not owned by you
+ */
+ if (uuid_compare (brickinfo->uuid, MY_UUID))
+ continue;
if (strlen(brickinfo->mount_dir) < 1) {
brick_mount_dir = NULL;
snprintf (key, sizeof(key), "brick%d.mount_dir",