From ce2c58d0fab517320059af7cea2e36e5cd246b6e Mon Sep 17 00:00:00 2001 From: Joseph Fernandes Date: Wed, 20 Jan 2016 22:27:33 +0530 Subject: 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 Change-Id: Ie60951c478a7462c425059699ab82511aa13fa0a BUG: 1300412 Signed-off-by: Joseph Fernandes Reviewed-on: http://review.gluster.org/13270 Smoke: Gluster Build System Tested-by: Dan Lambright NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Dan Lambright --- xlators/cluster/dht/src/dht-shared.c | 6 +++--- xlators/cluster/dht/src/tier.c | 5 +++-- 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 d25f7d9e33b..e3e7fadca3f 100644 --- a/xlators/cluster/dht/src/dht-shared.c +++ b/xlators/cluster/dht/src/dht-shared.c @@ -1003,7 +1003,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" }, @@ -1030,11 +1030,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 2e0a7c78af4..522ac547e6e 100644 --- a/xlators/cluster/dht/src/tier.c +++ b/xlators/cluster/dht/src/tier.c @@ -1841,7 +1841,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); @@ -2018,7 +2018,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 ee59e7d5daa..112980c4661 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -2374,7 +2374,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, @@ -2418,7 +2418,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, @@ -2428,7 +2428,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, -- cgit