From abf6196e1faa00a83fc0dc26150f55ca275131a9 Mon Sep 17 00:00:00 2001 From: Dan Lambright Date: Tue, 15 Dec 2015 19:30:45 -0500 Subject: cluster/tier: fix tier-max-files bookeeping and help The option tier-max-files represents the maximum number of files trasferred by a node in a gives cycle. Fix help message to reflect the "per node" aspect. The code transferred one more file per cycle than the given value. Also change the default values of max file and max bytes to very large values, effectively we will not throttle migration unless the administrator requests it via CLI. This is a backport of 12984. > Change-Id: Ic2949ed3d8c35afe7c9ae4db72195603cfb2e28f > BUG: 1292671 > Signed-off-by: Dan Lambright > Reviewed-on: http://review.gluster.org/12984 > Tested-by: NetBSD Build System > Tested-by: Gluster Build System Signed-off-by: Dan Lambright Change-Id: Ibb234976f912ff4b20e894f2984c63792acfe814 BUG: 1292945 Reviewed-on: http://review.gluster.org/13004 Tested-by: NetBSD Build System Reviewed-by: Dan Lambright Tested-by: Dan Lambright --- xlators/cluster/dht/src/dht-rebalance.c | 1 - xlators/cluster/dht/src/tier.c | 2 +- xlators/mgmt/glusterd/src/glusterd-volume-set.c | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'xlators') diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index d14b92e984e..6375286f636 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -3511,7 +3511,6 @@ gf_defrag_pause_tier (xlator_t *this, gf_defrag_info_t *defrag) (defrag->defrag_status != GF_DEFRAG_STATUS_STARTED)) { goto out; } - usleep (usec_sleep); } diff --git a/xlators/cluster/dht/src/tier.c b/xlators/cluster/dht/src/tier.c index ed8788f97c7..393dde4361c 100644 --- a/xlators/cluster/dht/src/tier.c +++ b/xlators/cluster/dht/src/tier.c @@ -532,7 +532,7 @@ abort: xdata_response = NULL; } - if ((total_files > defrag->tier_conf.max_migrate_files) + if ((total_files >= defrag->tier_conf.max_migrate_files) || (total_migrated_bytes > defrag->tier_conf.max_migrate_bytes)) { gf_msg (this->name, GF_LOG_INFO, 0, diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index 403b97f9fde..b3112ca75f5 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -2294,22 +2294,22 @@ struct volopt_map_entry glusterd_volopt_map[] = { { .key = "cluster.tier-max-mb", .voltype = "cluster/tier", .option = "tier-max-mb", - .value = "1000", + .value = "10000", .op_version = GD_OP_VERSION_3_7_6, .flags = OPT_FLAG_CLIENT_OPT, .validate_fn = validate_tier, .description = "The maximum number of MB that may be migrated" - " in any direction in a given cycle." + " in any direction in a given cycle by a single node." }, { .key = "cluster.tier-max-files", .voltype = "cluster/tier", .option = "tier-max-files", - .value = "5000", + .value = "50000", .op_version = GD_OP_VERSION_3_7_6, .flags = OPT_FLAG_CLIENT_OPT, .validate_fn = validate_tier, .description = "The maximum number of files that may be migrated" - " in any direction in a given cycle." + " in any direction in a given cycle by a single node." }, { .key = "features.ctr-enabled", .voltype = "features/changetimerecorder", -- cgit