summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorN Balachandran <nbalacha@redhat.com>2017-06-19 11:50:28 +0530
committerJeff Darcy <jeff@pl.atyp.us>2017-06-20 12:31:48 +0000
commit426c2908aee4addd36d925ee93e56c9b2688ec1b (patch)
tree91b2601911732bfe2f1f43a121877499ff1dec6c
parent0a8dac38ac4415ea770fb36b34e3c494e8713e6e (diff)
cluster/dht: Additional checks for rebalance estimates
The rebalance estimates calculation was not handling calculations correctly when no files had been processed, i.e., when rate_lookedup was 0. Now, the estimated time is set to 0 in such scenarios as there is no way for rebalance to figure out how long the process will take to complete without knowing the rate at which the files are being processed. Change-Id: I7b6378e297e1ba139852bcb2239adf2477336b5b BUG: 1457985 Signed-off-by: N Balachandran <nbalacha@redhat.com> Reviewed-on: https://review.gluster.org/17564 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Amar Tumballi <amarts@redhat.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
-rw-r--r--xlators/cluster/dht/src/dht-rebalance.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index 25b879a6b57..669db2b84ba 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -4497,9 +4497,10 @@ gf_defrag_get_estimates (dht_conf_t *conf)
rate_lookedup = (total_processed)/elapsed;
- /* We initially sum up dirs across all local subvols.
- * The same directories will be counted for each subvol so
- * we want to ensure that they are only counted once.
+ /* We initially sum up dirs across all local subvols because we get the
+ * file count from the inodes on each subvol.
+ * The same directories will be counted for each subvol but
+ * we want that they are only counted once.
*/
tmp_count = g_totalfiles
@@ -4508,7 +4509,14 @@ gf_defrag_get_estimates (dht_conf_t *conf)
if (total_processed > g_totalfiles)
g_totalfiles = total_processed + 10000;
- time_to_complete = (tmp_count)/rate_lookedup;
+ if (rate_lookedup) {
+ time_to_complete = (tmp_count)/rate_lookedup;
+
+ } else {
+
+ gf_msg (THIS->name, GF_LOG_ERROR, 0, 0,
+ "Unable to calculate estimated time for rebalance");
+ }
gf_log (THIS->name, GF_LOG_INFO,
"TIME: total_processed=%"PRIu64" tmp_cnt = %"PRIu64","
@@ -4561,7 +4569,9 @@ gf_defrag_status_get (dht_conf_t *conf, dict_t *dict)
&& (defrag->defrag_status == GF_DEFRAG_STATUS_STARTED)) {
time_to_complete = gf_defrag_get_estimates (conf);
- time_left = time_to_complete - elapsed;
+
+ if (time_to_complete && (time_to_complete > elapsed))
+ time_left = time_to_complete - elapsed;
gf_log (THIS->name, GF_LOG_INFO,
"TIME: Estimated total time to complete = %"PRIu64