summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--xlators/cluster/dht/src/dht-rebalance.c1
-rw-r--r--xlators/cluster/dht/src/tier.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c8
3 files changed, 5 insertions, 6 deletions
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index 8621d1c072b..78cccc02c48 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -3628,7 +3628,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 51c18de094b..10036368720 100644
--- a/xlators/cluster/dht/src/tier.c
+++ b/xlators/cluster/dht/src/tier.c
@@ -528,7 +528,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 f849c313e87..b5e5d5fbf7b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -2341,22 +2341,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",