diff options
| author | Dan Lambright <dlambrig@redhat.com> | 2015-12-15 19:30:45 -0500 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-12-20 05:22:08 -0800 |
| commit | abf6196e1faa00a83fc0dc26150f55ca275131a9 (patch) | |
| tree | 8265b737658cadd8dc486cb2770d2dfb1d9b3bc5 /xlators/cluster/dht/src | |
| parent | 66078a41a96fa3d00d226e3aaf7ec17c2deda953 (diff) | |
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 <dlambrig@redhat.com>
> Reviewed-on: http://review.gluster.org/12984
> Tested-by: NetBSD Build System <jenkins@build.gluster.org>
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
Signed-off-by: Dan Lambright <dlambrig@redhat.com>
Change-Id: Ibb234976f912ff4b20e894f2984c63792acfe814
BUG: 1292945
Reviewed-on: http://review.gluster.org/13004
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Dan Lambright <dlambrig@redhat.com>
Diffstat (limited to 'xlators/cluster/dht/src')
| -rw-r--r-- | xlators/cluster/dht/src/dht-rebalance.c | 1 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/tier.c | 2 |
2 files changed, 1 insertions, 2 deletions
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, |