summaryrefslogtreecommitdiffstats
path: root/cli
diff options
context:
space:
mode:
authorN Balachandran <nbalacha@redhat.com>2017-08-08 23:11:10 +0530
committerjiffin tony Thottan <jthottan@redhat.com>2017-11-10 08:51:04 +0000
commitc8fd28becaa02b248f4bb5c9ea6fdd021579a45f (patch)
tree72ff1d675756432054a0174d585ff0e7568a3bdc /cli
parenta230a1a37770d283ff8d36c90af819fa6317c518 (diff)
cli: correct rebalance status elapsed check
Check that elapsed time has crossed 10 mins for at least one rebalance process before displaying the estimates. > BUG: 1479528 > Signed-off-by: N Balachandran <nbalacha@redhat.com> (cherry picked from commit 56aef68530b3bab27730aa62e4fbc513d3dba65f) Change-Id: Ib357a6f0d0125a178e94ede1e31514fdc6ce3593 BUG: 1511271 Signed-off-by: N Balachandran <nbalacha@redhat.com>
Diffstat (limited to 'cli')
-rw-r--r--cli/src/cli-rpc-ops.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index eb1ca7788c4..58ecd8ba1f8 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -1613,6 +1613,7 @@ gf_cli_print_rebalance_status (dict_t *dict, enum gf_task_types task_type,
gf_boolean_t down = _gf_false;
gf_boolean_t fix_layout = _gf_false;
uint64_t max_time = 0;
+ uint64_t max_elapsed = 0;
uint64_t time_left = 0;
gf_boolean_t show_estimates = _gf_false;
@@ -1755,6 +1756,9 @@ gf_cli_print_rebalance_status (dict_t *dict, enum gf_task_types task_type,
gf_log ("cli", GF_LOG_TRACE,
"failed to get time left");
+ if (elapsed > max_elapsed)
+ max_elapsed = elapsed;
+
if (time_left > max_time)
max_time = time_left;
@@ -1815,7 +1819,7 @@ gf_cli_print_rebalance_status (dict_t *dict, enum gf_task_types task_type,
if (!show_estimates) {
goto out;
}
- if (elapsed <= REBAL_ESTIMATE_START_TIME) {
+ if (max_elapsed <= REBAL_ESTIMATE_START_TIME) {
cli_out ("The estimated time for rebalance to complete "
"will be unavailable for the first 10 "
"minutes.");