summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
diff options
context:
space:
mode:
authorGaurav Kumar Garg <garg.gaurav52@gmail.com>2015-09-04 22:10:55 +0530
committerAtin Mukherjee <amukherj@redhat.com>2015-09-07 21:45:19 -0700
commit9efce73fb31d520706a6d47de4daa4fb3366e6a6 (patch)
treebea2a6276d059def5b7a86e1df659b61928ef230 /xlators/mgmt/glusterd/src/glusterd-brick-ops.c
parent55a493f4db6752303ad2a88572e4d75453054bce (diff)
glusterd: Do not allow "detach-tier commit" unnecessarily
Currently when user execute gluster v detach-tier commit command without starting detach-tier or without giving force option then gluster will success this operation. Detach-tier commit should not allow without giving "force" optioin. Change-Id: Id161c288f6f3e0f6b298878a5c35a49fcbd9c6e3 BUG: 1260185 Signed-off-by: Gaurav Kumar Garg <ggarg@redhat.com> Reviewed-on: http://review.gluster.org/12107 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Atin Mukherjee <amukherj@redhat.com> Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-brick-ops.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-brick-ops.c30
1 files changed, 21 insertions, 9 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
index 9e6c73d..73c40bd 100644
--- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
@@ -1692,16 +1692,28 @@ glusterd_remove_brick_validate_bricks (gf1_op_commands cmd, int32_t brick_count,
goto out;
}
/* Do not allow commit if the bricks are not decommissioned
- * if its a remove brick commit
+ * if its a remove brick commit or detach-tier commit
*/
- if (cmd == GF_OP_CMD_COMMIT && !brickinfo->decommissioned) {
- snprintf (msg, sizeof (msg), "Brick %s "
- "is not decommissioned. "
- "Use start or force option",
- brick);
- *errstr = gf_strdup (msg);
- ret = -1;
- goto out;
+ if (!brickinfo->decommissioned) {
+ if (cmd == GF_OP_CMD_COMMIT) {
+ snprintf (msg, sizeof (msg), "Brick %s "
+ "is not decommissioned. "
+ "Use start or force option", brick);
+ *errstr = gf_strdup (msg);
+ ret = -1;
+ goto out;
+ }
+
+ if (cmd == GF_OP_CMD_DETACH_COMMIT) {
+ snprintf (msg, sizeof (msg), "Brick's in Hot "
+ "tier is not decommissioned yet. Use "
+ "gluster volume detach-tier <VOLNAME>"
+ " <start | commit | [force]>"
+ " command instead");
+ *errstr = gf_strdup (msg);
+ ret = -1;
+ goto out;
+ }
}
if (glusterd_is_local_brick (THIS, volinfo, brickinfo))