From 224895148d95742c1f36b48bb79d8b9ef1ff0cd6 Mon Sep 17 00:00:00 2001 From: Sanju Rakonde Date: Wed, 3 Oct 2018 23:58:37 +0530 Subject: glusterd: ensure volinfo->caps is set to correct value With the commit febf5ed4848, during the volume create op, we are setting volinfo->caps to 0, only if any of the bricks belong to the same node and brickinfo->vg[0] is null. Previously, we used to set volinfo->caps to 0, when either brick doesn't belong to the same node or brickinfo->vg[0] is null. With this patch, we set volinfo->caps to 0, when either brick doesn't belong to the same node or brickinfo->vg[0] is null. (as we do earlier without commit febf5ed4848). > BUG: bz#1635820 > Change-Id: I00a97415786b775fb088ac45566ad52b402f1a49 > Signed-off-by: Sanju Rakonde fixes: bz#1643052 Change-Id: I00a97415786b775fb088ac45566ad52b402f1a49 Signed-off-by: Sanju Rakonde --- xlators/mgmt/glusterd/src/glusterd-volume-ops.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'xlators') diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c index e46ef57e44..b72def8e4e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c @@ -2489,6 +2489,8 @@ glusterd_op_create_volume (dict_t *dict, char **op_errstr) caps = 0; } #endif + } else { + caps = 0; } cds_list_add_tail (&brickinfo->brick_list, &volinfo->bricks); -- cgit