diff options
| author | Mohammed Rafi KC <rkavunga@redhat.com> | 2015-05-11 14:43:23 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2015-06-16 22:13:18 -0700 |
| commit | a975c385c9cb0bb0b42993c2eb23a6f9bf277991 (patch) | |
| tree | 943c96b4359704b2160c1b7183f91eedc4e84a88 /xlators/cluster | |
| parent | bf6a71bcb08357766027e9318edae4b8298c339c (diff) | |
tier/volume set: Validate volume set option for tier
Volume set option related to tier volume can only be set
for tier volume, also currently all volume set i for tier
option accepts a non-negative integer. This patch validate
both condition.
Back port of:
>Change-Id: I3611af048ff4ab193544058cace8db205ea92336
>BUG: 1216960
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
>Signed-off-by: Dan Lambright <dlambrig@redhat.com>
>Reviewed-on: http://review.gluster.org/10751
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Tested-by: NetBSD Build System <jenkins@build.gluster.org>
>Reviewed-by: Joseph Fernandes
(cherry picked from commit f6a062044a3447bea5bf0fcf21a3f85c00fb6c7d)
Change-Id: Ic6081f0ce7ae7effac69ba192bd35c8d382a11d5
BUG: 1230560
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
Reviewed-on: http://review.gluster.org/11173
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Joseph Fernandes
Tested-by: Joseph Fernandes
Diffstat (limited to 'xlators/cluster')
| -rw-r--r-- | xlators/cluster/dht/src/tier.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/xlators/cluster/dht/src/tier.c b/xlators/cluster/dht/src/tier.c index 0a9c07352ee..6c5dfeb0501 100644 --- a/xlators/cluster/dht/src/tier.c +++ b/xlators/cluster/dht/src/tier.c @@ -829,6 +829,12 @@ tier_start (xlator_t *this, gf_defrag_info_t *defrag) } tick = (tick + 1) % TIMER_SECS; + + if (freq_promote != defrag->tier_promote_frequency) + next_promote = tick; + if (freq_demote != defrag->tier_demote_frequency) + next_demote = tick; + if ((next_demote != tick) && (next_promote != tick)) continue; |