diff options
| author | Pranith Kumar K <pranithk@gluster.com> | 2010-08-30 05:52:27 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-08-30 07:07:55 -0700 |
| commit | 80d091411f6d4b9bc6bd5f19c921bdb295611b5d (patch) | |
| tree | 3d2b5f358f4850e921fd8bc47d0bbc9752499ffb | |
| parent | 61bed5ef8b8ebda1ffac737a5526b8187852bc2d (diff) | |
mgmt/glusterd: fixed volgen creation problems
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 1454 (Remove brick unsuccessful - wrong volume info)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1454
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 12 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 12 |
2 files changed, 5 insertions, 19 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 24cd1ab3310..3cea96c1632 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -1914,10 +1914,6 @@ glusterd_op_remove_brick (gd1_mgmt_stage_op_req *req) if ((!uuid_compare (brickinfo->uuid, priv->uuid)) && (GLUSTERD_STATUS_STARTED == volinfo->status)) { - ret = glusterd_create_volfiles (volinfo); - if (ret) - goto out; - gf_log ("", GF_LOG_NORMAL, "About to stop glusterfs" " for brick %s:%s", brickinfo->hostname, brickinfo->path); @@ -1940,11 +1936,9 @@ glusterd_op_remove_brick (gd1_mgmt_stage_op_req *req) i++; } - if (!glfs_stopped) { - ret = glusterd_create_volfiles (volinfo); - if (ret) - goto out; - } + ret = glusterd_create_volfiles (volinfo); + if (ret) + goto out; volinfo->version++; diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index b8f2cb99ac1..2f4ab6cd4bd 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -1365,23 +1365,15 @@ generate_client_volfile (glusterd_volinfo_t *volinfo, char *filename) num_bricks++; if (GF_CLUSTER_TYPE_REPLICATE == volinfo->type) { - ret = dict_get_int32 (dict, "replica-count", - &replicate_count); - if (ret) - goto out; - gf_log ("", GF_LOG_DEBUG, "Volfile is distributed-replicated"); + replicate_count = volinfo->sub_count; dist_count = num_bricks / replicate_count; } else if (GF_CLUSTER_TYPE_STRIPE == volinfo->type) { - ret = dict_get_int32 (dict, "stripe-count", - &stripe_count); - if (ret) - goto out; - gf_log ("", GF_LOG_DEBUG, "Volfile is distributed-striped"); + stripe_count = volinfo->sub_count; dist_count = num_bricks / stripe_count; } else { gf_log ("", GF_LOG_DEBUG, |