From: yangsheng <ys@whamcloud.com>
Date: Thu, 15 Mar 2012 16:18:29 +0000 (+0800)
Subject: LU-1218 proc: Recovery timer in proc always displays 0
X-Git-Tag: 2.2.51~50
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d995a4ae014e321b9346995078c283d0a4bd75b5;p=fs%2Flustre-release.git

LU-1218 proc: Recovery timer in proc always displays 0

Calculate remain recovery time for proc display.

Signed-off-by: yang sheng <ys@whamcloud.com>
Change-Id: I50c14859c704c7e2bc60b66b3d70350648feebb6
Reviewed-on: http://review.whamcloud.com/2334
Tested-by: Hudson
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Mike Pershin <tappro@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
index cb70b31..9016914 100644
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -2282,8 +2282,12 @@ int lprocfs_obd_rd_recovery_status(char *page, char **start, off_t off,
                                  obd->obd_recovery_start) <= 0)
                 goto out;
         if (lprocfs_obd_snprintf(&page, size, &len, "time_remaining: %lu\n",
-                           cfs_time_current_sec() >= obd->obd_recovery_end ? 0 :
-                           obd->obd_recovery_end - cfs_time_current_sec()) <= 0)
+                                 cfs_time_current_sec() >=
+                                 obd->obd_recovery_start +
+                                 obd->obd_recovery_timeout ? 0 :
+                                 obd->obd_recovery_start +
+                                 obd->obd_recovery_timeout -
+                                 cfs_time_current_sec()) <= 0)
                 goto out;
         if (lprocfs_obd_snprintf(&page, size, &len,"connected_clients: %d/%d\n",
                                  cfs_atomic_read(&obd->obd_connected_clients),