From e6b8d02d20a63b969cc8d82756967a404dd72c5d Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 3 Jun 2010 19:52:46 +0200
Subject: [PATCH] Show formatted ETA for disk sync and import/export
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/cmdlib.py | 3 ++-
lib/masterd/instance.py | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 7af4bf1c9..ab1adb220 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2613,7 +2613,8 @@ def _WaitForSync(lu, instance, disks=None, oneshot=False):
if mstat.sync_percent is not None:
done = False
if mstat.estimated_time is not None:
- rem_time = "%d estimated seconds remaining" % mstat.estimated_time
+ rem_time = ("%s remaining (estimated)" %
+ utils.FormatSeconds(mstat.estimated_time))
max_time = mstat.estimated_time
else:
rem_time = "no time estimate"
diff --git a/lib/masterd/instance.py b/lib/masterd/instance.py
index 1e13d111c..04806dad6 100644
--- a/lib/masterd/instance.py
+++ b/lib/masterd/instance.py
@@ -623,7 +623,7 @@ def FormatProgress(progress):
"""Formats progress information for user consumption
"""
- (mbytes, throughput, percent, _) = progress
+ (mbytes, throughput, percent, eta) = progress
parts = [
utils.FormatUnit(mbytes, "h"),
@@ -635,7 +635,8 @@ def FormatProgress(progress):
if percent is not None:
parts.append("%d%%" % percent)
- # TODO: Format ETA
+ if eta is not None:
+ parts.append("ETA %s" % utils.FormatSeconds(eta))
return utils.CommaJoin(parts)
--
GitLab