summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
diff options
context:
space:
mode:
authorRavishankar N <ravishankar@redhat.com>2014-07-17 08:30:52 +0000
committerKaushal M <kaushal@redhat.com>2014-07-24 23:29:01 -0700
commitc57895242fff0c05a24f99273f25cd793336f08d (patch)
treeb96b81141acdcf1ecadf03727a76a70b424732d1 /xlators/mgmt/glusterd/src/glusterd-brick-ops.c
parent88eb28678c3a16264b5baa57af0d16778ea2c9e6 (diff)
glusterd: update volinfo->subvol_count during remove-brick operation.
Problem: In glusterd_op_remove_brick(), volinfo->subvol_count was getting updated only if the replica count was reduced due to which subvol_matcher_verify() gave false errors under certain scenarios (see bug description). Fix: updated subvol_count for every remove-brick operation. Change-Id: Id72691e2bda1c624cd7d8cae92f6bf32c101a6d3 BUG: 1120647 Signed-off-by: Ravishankar N <ravishankar@redhat.com> Reviewed-on: http://review.gluster.org/8326 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Atin Mukherjee <amukherj@redhat.com> Reviewed-by: Kaushal M <kaushal@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-brick-ops.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-brick-ops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
index 089c7d637c9..efaefe7b761 100644
--- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
@@ -2004,6 +2004,8 @@ glusterd_op_remove_brick (dict_t *dict, char **op_errstr)
if (GF_OP_CMD_START == cmd)
volinfo->rebal.dict = dict_ref (bricks_dict);
+ volinfo->subvol_count = (volinfo->brick_count /
+ volinfo->dist_leaf_count);
ret = dict_get_int32 (dict, "replica-count", &replica_count);
if (!ret) {
gf_log (this->name, GF_LOG_INFO,
@@ -2013,8 +2015,6 @@ glusterd_op_remove_brick (dict_t *dict, char **op_errstr)
volinfo->replica_count = replica_count;
volinfo->sub_count = replica_count;
volinfo->dist_leaf_count = glusterd_get_dist_leaf_count (volinfo);
- volinfo->subvol_count = (volinfo->brick_count /
- volinfo->dist_leaf_count);
if (replica_count == 1) {
if (volinfo->type == GF_CLUSTER_TYPE_REPLICATE) {