diff options
| author | Joseph Fernandes <josferna@redhat.com> | 2016-01-20 22:27:33 +0530 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2016-02-14 06:04:21 -0800 |
| commit | 0488cd5683f81eb49636cab59a6a43951e057013 (patch) | |
| tree | 553b0861458d978a1a03c33b8c59acc01393386e | |
| parent | 059710ad62d828d40760c9c63a109286e5e5dca3 (diff) | |
tier/dht : Default value for demote-freq, max files and mb
Default value for tier-demote-frequency is 3600 sec to avoid
frequent demotions.
Default value for tier-max-mb is 4000 mb
Default value for tier-max-files is 10000 files
Backport of http://review.gluster.org/13270
> Change-Id: Ie60951c478a7462c425059699ab82511aa13fa0a
> BUG: 1300412
> Signed-off-by: Joseph Fernandes <josferna@redhat.com>
> Reviewed-on: http://review.gluster.org/13270
> Smoke: Gluster Build System <jenkins@build.gluster.com>
> Tested-by: Dan Lambright <dlambrig@redhat.com>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Signed-off-by: Joseph Fernandes <josferna@redhat.com>
Change-Id: Ic4458b1b78dc3c6059713f3871e9e2dc8f38b39a
BUG: 1306302
Reviewed-on: http://review.gluster.org/13424
Smoke: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Joseph Fernandes
Tested-by: Joseph Fernandes
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
| -rw-r--r-- | xlators/cluster/dht/src/dht-shared.c | 6 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/tier.c | 5 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-set.c | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c index 9d869e39f0e..84f86bd10de 100644 --- a/xlators/cluster/dht/src/dht-shared.c +++ b/xlators/cluster/dht/src/dht-shared.c @@ -1008,7 +1008,7 @@ struct volume_options options[] = { { .key = {"tier-demote-frequency"}, .type = GF_OPTION_TYPE_INT, - .default_value = "120", + .default_value = "3600", .description = "Frequency to demote files to slow tier" }, @@ -1035,11 +1035,11 @@ struct volume_options options[] = { }, { .key = {"tier-max-mb"}, .type = GF_OPTION_TYPE_INT, - .default_value = "1000", + .default_value = "4000", }, { .key = {"tier-max-files"}, .type = GF_OPTION_TYPE_INT, - .default_value = "5000", + .default_value = "10000", }, /* switch option */ { .key = {"pattern.switch.case"}, diff --git a/xlators/cluster/dht/src/tier.c b/xlators/cluster/dht/src/tier.c index 63419d79db8..67ee1adc12a 100644 --- a/xlators/cluster/dht/src/tier.c +++ b/xlators/cluster/dht/src/tier.c @@ -1801,7 +1801,7 @@ tier_init (xlator_t *this) freq = DEFAULT_TIER_MAX_MIGRATE_MB; } - defrag->tier_conf.max_migrate_bytes = freq * 1024 * 1024; + defrag->tier_conf.max_migrate_bytes = (uint64_t) freq * 1024 * 1024; ret = dict_get_int32 (this->options, "tier-max-files", &freq); @@ -1978,7 +1978,8 @@ tier_reconfigure (xlator_t *this, dict_t *options) GF_OPTION_RECONF ("tier-max-mb", migrate_mb, options, int32, out); - defrag->tier_conf.max_migrate_bytes = migrate_mb*1024*1024; + defrag->tier_conf.max_migrate_bytes = (uint64_t) migrate_mb * + 1024 * 1024; GF_OPTION_RECONF ("tier-max-files", defrag->tier_conf.max_migrate_files, options, diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index ff89979ff3f..09ee73aba66 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -2313,7 +2313,7 @@ struct volopt_map_entry glusterd_volopt_map[] = { }, { .key = "cluster.tier-demote-frequency", .voltype = "cluster/tier", - .value = "120", + .value = "3600", .option = "tier-demote-frequency", .op_version = GD_OP_VERSION_3_7_0, .flags = OPT_FLAG_CLIENT_OPT, @@ -2357,7 +2357,7 @@ struct volopt_map_entry glusterd_volopt_map[] = { { .key = "cluster.tier-max-mb", .voltype = "cluster/tier", .option = "tier-max-mb", - .value = "10000", + .value = "4000", .op_version = GD_OP_VERSION_3_7_6, .flags = OPT_FLAG_CLIENT_OPT, .validate_fn = validate_tier, @@ -2367,7 +2367,7 @@ struct volopt_map_entry glusterd_volopt_map[] = { { .key = "cluster.tier-max-files", .voltype = "cluster/tier", .option = "tier-max-files", - .value = "50000", + .value = "10000", .op_version = GD_OP_VERSION_3_7_6, .flags = OPT_FLAG_CLIENT_OPT, .validate_fn = validate_tier, |