summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaghavendra Bhat <raghavendrabhat@gluster.com>2010-09-08 08:53:21 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-09-08 11:24:46 -0700
commit43d36d456314f6d4e67c3d8f06cceb585f467915 (patch)
tree35c7b5093dcc47eb2e6048ebf24bb05f6ebdabee
parent5ed8eba1b15b538ca2c74d8130fb3f0a394921ec (diff)
allow brick to be added in a plain replicate volume if a brick is removed
Signed-off-by: Raghavendra Bhat <raghavendrabhat@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 1574 () URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1574
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handler.c6
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c34
2 files changed, 32 insertions, 8 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index 6dee035..6b5b01c 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -1386,6 +1386,12 @@ glusterd_handle_add_brick (rpcsvc_request_t *req)
goto brick_val;
if (!brick_count || !volinfo->sub_count)
goto brick_val;
+
+ if (volinfo->brick_count < volinfo->sub_count) {
+ if ((volinfo->sub_count - volinfo->brick_count) == brick_count)
+ goto brick_val;
+ }
+
if ((brick_count % volinfo->sub_count) != 0) {
snprintf(err_str, 2048, "Incorrect number of bricks"
" supplied %d for type %s with count %d",
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index d368e5c..ce6547e 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -1477,16 +1477,34 @@ generate_client_volfile (glusterd_volinfo_t *volinfo, char *filename)
num_bricks++;
if (GF_CLUSTER_TYPE_REPLICATE == volinfo->type) {
- gf_log ("", GF_LOG_DEBUG,
- "Volfile is distributed-replicated");
- replicate_count = volinfo->sub_count;
- dist_count = num_bricks / replicate_count;
+ if (volinfo->brick_count <= volinfo->sub_count) {
+ gf_log ("", GF_LOG_DEBUG,
+ "Volfile is plain replicated");
+ replicate_count = volinfo->sub_count;
+ dist_count = num_bricks / replicate_count;
+ if (!dist_count) {
+ replicate_count = num_bricks;
+ dist_count = num_bricks / replicate_count;
+ }
+ } else {
+ 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) {
- gf_log ("", GF_LOG_DEBUG,
- "Volfile is distributed-striped");
- stripe_count = volinfo->sub_count;
- dist_count = num_bricks / stripe_count;
+ if (volinfo->brick_count == volinfo->sub_count) {
+ gf_log ("", GF_LOG_DEBUG,
+ "Volfile is plain striped");
+ stripe_count = volinfo->sub_count;
+ dist_count = num_bricks / stripe_count;
+ } else {
+ 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,
"Volfile is plain distributed");