From e79be3d1655edb2b9f64a13e1fabae601c7d19e4 Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Wed, 7 Aug 2013 12:25:07 +0530 Subject: glusterd: Try to start all bricks on 'start force' A volume would fail to start if any one of the bricks fails staging or fails to start, even with the 'force' option. With this patch, when the 'force' option is given for a volume start, glusterd will continue and start other bricks even if one fails staging or starting. Also did a small fix in changelog, to prevent it crashing when it fails to init. Change-Id: I7efbd9ab13d12d69b0335ae54143fa17586f8f98 BUG: 994375 Signed-off-by: Kaushal M Reviewed-on: http://review.gluster.org/5510 Reviewed-by: Venky Shankar Reviewed-by: Amar Tumballi Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/features/changelog/src/changelog.c | 10 ++++++---- xlators/mgmt/glusterd/src/glusterd-volume-ops.c | 9 +++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'xlators') diff --git a/xlators/features/changelog/src/changelog.c b/xlators/features/changelog/src/changelog.c index f3aa6dd6..fe064342 100644 --- a/xlators/features/changelog/src/changelog.c +++ b/xlators/features/changelog/src/changelog.c @@ -1385,10 +1385,12 @@ init (xlator_t *this) if (ret) { if (this->local_pool) mem_pool_destroy (this->local_pool); - ret = priv->cb->dtor (this, &priv->cd); - if (ret) - gf_log (this->name, GF_LOG_ERROR, - "error in cleanup during init()"); + if (priv->cb) { + ret = priv->cb->dtor (this, &priv->cd); + if (ret) + gf_log (this->name, GF_LOG_ERROR, + "error in cleanup during init()"); + } GF_FREE (priv->changelog_brick); GF_FREE (priv->changelog_dir); GF_FREE (priv); diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c index 7cac938c..c1aea413 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c @@ -915,7 +915,9 @@ glusterd_op_stage_start_volume (dict_t *dict, char **op_errstr) continue; ret = gf_lstat_dir (brickinfo->path, NULL); - if (ret) { + if (ret && (flags & GF_CLI_FLAG_OP_FORCE)) { + continue; + } else if (ret) { snprintf (msg, sizeof (msg), "Failed to find " "brick directory %s for volume %s. " "Reason : %s", brickinfo->path, @@ -1704,7 +1706,10 @@ glusterd_op_start_volume (dict_t *dict, char **op_errstr) list_for_each_entry (brickinfo, &volinfo->bricks, brick_list) { ret = glusterd_brick_start (volinfo, brickinfo, _gf_true); - if (ret) + /* If 'force' try to start all bricks regardless of success or + * failure + */ + if (!(flags & GF_CLI_FLAG_OP_FORCE) && ret) goto out; } -- cgit