diff options
| author | Mohammed Rafi KC <rkavunga@redhat.com> | 2015-11-24 20:59:29 +0530 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-11-26 11:39:17 -0800 |
| commit | 3ef88ec70aefd278155aa485e83a2d7bba8b6663 (patch) | |
| tree | 87a75d676fb602fd9d0769be84f9520f644e1226 /xlators/mgmt/glusterd/src/glusterd-brick-ops.c | |
| parent | 8d2594d77127ba7ea07a0d68afca0939e1817e39 (diff) | |
glusterd/tier: Reset to reconfigured values after detach-tier
After detach-tier commit , we have to reset the option
reconfigured for tier volume
Change-Id: Iae0210259720d6ac14ccc0cc339dc9f54a0c4571
BUG: 1285046
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
Reviewed-on: http://review.gluster.org/12736
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-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.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c index 042198510e1..3c2218079f9 100644 --- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c @@ -2358,6 +2358,10 @@ glusterd_op_remove_brick (dict_t *dict, char **op_errstr) int defrag_cmd = 0; int detach_commit = 0; void *tier_info = NULL; + char *cold_shd_key = NULL; + char *hot_shd_key = NULL; + int delete_key = 1; + this = THIS; GF_ASSERT (this); @@ -2482,6 +2486,35 @@ glusterd_op_remove_brick (dict_t *dict, char **op_errstr) case GF_OP_CMD_DETACH_COMMIT_FORCE: glusterd_op_perform_detach_tier (volinfo); detach_commit = 1; + + /* Disabling ctr when detaching a tier, since + * currently tier is the only consumer of ctr. + * Revisit this code when this constraint no + * longer exist. + */ + dict_del (volinfo->dict, "features.ctr-enabled"); + dict_del (volinfo->dict, "cluster.tier-mode"); + + hot_shd_key = gd_get_shd_key (volinfo->tier_info.hot_type); + cold_shd_key = gd_get_shd_key (volinfo->tier_info.cold_type); + if (hot_shd_key) { + /* + * Since post detach, shd graph will not contain hot + * tier. So we need to clear option set for hot tier. + * For a tiered volume there can be different key + * for both hot and cold. If hot tier is shd compatible + * then we need to remove the configured value when + * detaching a tier, only if the key's are different or + * cold key is NULL. So we will set delete_key first, + * and if cold key is not null and they are equal then + * we will clear the flag. Otherwise we will delete the + * key. + */ + if (cold_shd_key) + delete_key = strcmp (hot_shd_key, cold_shd_key); + if (delete_key) + dict_del (volinfo->dict, hot_shd_key); + } /* fall through */ case GF_OP_CMD_COMMIT_FORCE: |