LU-8649 recovery: print some useful messages in recovery

[fs/lustre-release.git] / lustre / obdclass / lprocfs_status_server.c

diff --git a/lustre/obdclass/lprocfs_status_server.c b/lustre/obdclass/lprocfs_status_server.c
index 9e0af3a..46ad92d 100644 (file)
--- a/lustre/obdclass/lprocfs_status_server.c
+++ b/lustre/obdclass/lprocfs_status_server.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2014, 2015, Intel Corporation.
+ * Copyright (c) 2014, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -577,11 +577,12 @@ int lprocfs_recovery_status_seq_show(struct seq_file *m, void *data)
        /* sampled unlocked, but really... */
        if (obd->obd_recovering == 0) {
                seq_printf(m, "COMPLETE\n");
-               seq_printf(m, "recovery_start: %lu\n", obd->obd_recovery_start);
-               seq_printf(m, "recovery_duration: %lu\n",
+               seq_printf(m, "recovery_start: %lld\n",
+                          (s64)obd->obd_recovery_start);
+               seq_printf(m, "recovery_duration: %lld\n",
                           obd->obd_recovery_end ?
                           obd->obd_recovery_end - obd->obd_recovery_start :
-                          cfs_time_current_sec() - obd->obd_recovery_start);
+                          ktime_get_real_seconds() - obd->obd_recovery_start);
                /* Number of clients that have completed recovery */
                seq_printf(m, "completed_clients: %d/%d\n",
                           obd->obd_max_recoverable_clients -
@@ -611,29 +612,35 @@ int lprocfs_recovery_status_seq_show(struct seq_file *m, void *data)
                        seq_printf(m, "WAITING\n");
                        seq_printf(m, "non-ready MDTs: %s\n",
                                   buf ? buf : "unknown (not enough RAM)");
-                       seq_printf(m, "recovery_start: %lu\n",
-                                  obd->obd_recovery_start);
-                       seq_printf(m, "time_waited: %lu\n",
-                                  cfs_time_current_sec() -
-                                  obd->obd_recovery_start);
+                       seq_printf(m, "recovery_start: %lld\n",
+                                  (s64)obd->obd_recovery_start);
+                       seq_printf(m, "time_waited: %lld\n",
+                                  (s64)(ktime_get_real_seconds() -
+                                        obd->obd_recovery_start));
                }
 
                if (buf != NULL)
                        OBD_FREE(buf, size);
 
                if (likely(count > 0))
-                       return 0;
+                       goto out;
+       }
+
+       /* recovery won't start until the clients connect */
+       if (obd->obd_recovery_start == 0) {
+               seq_printf(m, "WAITING_FOR_CLIENTS\n");
+               goto out;
        }
 
        seq_printf(m, "RECOVERING\n");
-       seq_printf(m, "recovery_start: %lu\n", obd->obd_recovery_start);
-       seq_printf(m, "time_remaining: %lu\n",
-                  cfs_time_current_sec() >=
+       seq_printf(m, "recovery_start: %lld\n", (s64)obd->obd_recovery_start);
+       seq_printf(m, "time_remaining: %lld\n",
+                  ktime_get_real_seconds() >=
                   obd->obd_recovery_start +
                   obd->obd_recovery_timeout ? 0 :
-                  obd->obd_recovery_start +
-                  obd->obd_recovery_timeout -
-                  cfs_time_current_sec());
+                  (s64)(obd->obd_recovery_start +
+                        obd->obd_recovery_timeout -
+                        ktime_get_real_seconds()));
        seq_printf(m, "connected_clients: %d/%d\n",
                   atomic_read(&obd->obd_connected_clients),
                   obd->obd_max_recoverable_clients);
@@ -688,12 +695,41 @@ lprocfs_ir_factor_seq_write(struct file *file, const char __user *buffer,
 }
 EXPORT_SYMBOL(lprocfs_ir_factor_seq_write);
 
+int lprocfs_checksum_dump_seq_show(struct seq_file *m, void *data)
+{
+       struct obd_device *obd = m->private;
+
+       LASSERT(obd != NULL);
+       seq_printf(m, "%d\n", obd->obd_checksum_dump);
+       return 0;
+}
+EXPORT_SYMBOL(lprocfs_checksum_dump_seq_show);
+
+ssize_t
+lprocfs_checksum_dump_seq_write(struct file *file, const char __user *buffer,
+                           size_t count, loff_t *off)
+{
+       struct seq_file *m = file->private_data;
+       struct obd_device *obd = m->private;
+       int rc;
+       __s64 val;
+
+       LASSERT(obd != NULL);
+       rc = lprocfs_str_to_s64(buffer, count, &val);
+       if (rc)
+               return rc;
+
+       obd->obd_checksum_dump = !!val;
+       return count;
+}
+EXPORT_SYMBOL(lprocfs_checksum_dump_seq_write);
+
 int lprocfs_recovery_time_soft_seq_show(struct seq_file *m, void *data)
 {
        struct obd_device *obd = m->private;
 
        LASSERT(obd != NULL);
-       seq_printf(m, "%d\n", obd->obd_recovery_timeout);
+       seq_printf(m, "%llu\n", obd->obd_recovery_timeout);
        return 0;
 }
 EXPORT_SYMBOL(lprocfs_recovery_time_soft_seq_show);
@@ -725,7 +761,7 @@ int lprocfs_recovery_time_hard_seq_show(struct seq_file *m, void *data)
        struct obd_device *obd = m->private;
 
        LASSERT(obd != NULL);
-       seq_printf(m, "%u\n", obd->obd_recovery_time_hard);
+       seq_printf(m, "%lld\n", obd->obd_recovery_time_hard);
        return 0;
 }
 EXPORT_SYMBOL(lprocfs_recovery_time_hard_seq_show);