Whamcloud - gitweb
LU-14927 osd: share brw_stats code between OSD back ends.
[fs/lustre-release.git] / lustre / obdclass / lprocfs_status_server.c
index f8626ba..7a78959 100644 (file)
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/obdclass/lprocfs_status_server.c
  */
@@ -671,6 +670,142 @@ void lprocfs_free_obd_stats(struct obd_device *obd)
 }
 EXPORT_SYMBOL(lprocfs_free_obd_stats);
 
+static void display_brw_stats(struct seq_file *seq, const char *name,
+                             const char *units, struct obd_histogram *read,
+                             struct obd_histogram *write, bool scale)
+{
+       unsigned long read_tot, write_tot, r, w, read_cum = 0, write_cum = 0;
+       unsigned int i;
+
+       seq_printf(seq, "\n%26s read      |     write\n", " ");
+       seq_printf(seq, "%-22s %-5s %% cum %% |  %-11s %% cum %%\n",
+                  name, units, units);
+
+       read_tot = lprocfs_oh_sum(read);
+       write_tot = lprocfs_oh_sum(write);
+
+       if (!read_tot && !write_tot)
+               return;
+
+       for (i = 0; i < OBD_HIST_MAX; i++) {
+               r = read->oh_buckets[i];
+               w = write->oh_buckets[i];
+               read_cum += r;
+               write_cum += w;
+               if (read_cum == 0 && write_cum == 0)
+                       continue;
+
+               if (!scale)
+                       seq_printf(seq, "%u", i);
+               else if (i < 10)
+                       seq_printf(seq, "%lu", BIT(i));
+               else if (i < 20)
+                       seq_printf(seq, "%luK", BIT(i - 10));
+               else
+                       seq_printf(seq, "%luM", BIT(i - 20));
+
+               seq_printf(seq, ":\t\t%10lu %3u %3u   | %4lu %3u %3u\n",
+                          r, pct(r, read_tot), pct(read_cum, read_tot),
+                          w, pct(w, write_tot), pct(write_cum, write_tot));
+
+               if (read_cum == read_tot && write_cum == write_tot)
+                       break;
+       }
+}
+
+static const struct brw_stats_props brw_props[] = {
+       { .bsp_name     = "pages per bulk r/w",
+         .bsp_units    = "rpcs",
+         .bsp_scale    = true                          },
+       { .bsp_name     = "discontiguous pages",
+         .bsp_units    = "rpcs",
+         .bsp_scale    = false                         },
+       { .bsp_name     = "discontiguous blocks",
+         .bsp_units    = "rpcs",
+         .bsp_scale    = false                         },
+       { .bsp_name     = "disk fragmented I/Os",
+         .bsp_units    = "ios",
+         .bsp_scale    = false                         },
+       { .bsp_name     = "disk I/Os in flight",
+         .bsp_units    = "ios",
+         .bsp_scale    = false                         },
+       { .bsp_name     = "I/O time (1/1000s)",
+         .bsp_units    = "ios",
+         .bsp_scale    = true                          },
+       { .bsp_name     = "disk I/O size",
+         .bsp_units    = "ios",
+         .bsp_scale    = true                          },
+};
+
+static int brw_stats_seq_show(struct seq_file *seq, void *v)
+{
+       struct brw_stats *brw_stats = seq->private;
+       int i;
+
+       /* this sampling races with updates */
+       lprocfs_stats_header(seq, ktime_get(), brw_stats->bs_init, 25, ":", 1);
+
+       for (i = 0; i < ARRAY_SIZE(brw_stats->bs_props); i++) {
+               if (!brw_stats->bs_props[i].bsp_name)
+                       continue;
+
+               display_brw_stats(seq, brw_stats->bs_props[i].bsp_name,
+                                 brw_stats->bs_props[i].bsp_units,
+                                 &brw_stats->bs_hist[i * 2],
+                                 &brw_stats->bs_hist[i * 2 + 1],
+                                 brw_stats->bs_props[i].bsp_scale);
+       }
+
+       return 0;
+}
+
+static ssize_t brw_stats_seq_write(struct file *file,
+                                  const char __user *buf,
+                                  size_t len, loff_t *off)
+{
+       struct seq_file *seq = file->private_data;
+       struct brw_stats *brw_stats = seq->private;
+       int i;
+
+       for (i = 0; i < BRW_RW_STATS_NUM; i++)
+               lprocfs_oh_clear(&brw_stats->bs_hist[i]);
+
+       return len;
+}
+
+LDEBUGFS_SEQ_FOPS(brw_stats);
+
+void ldebugfs_register_osd_stats(struct dentry *parent,
+                                struct brw_stats *brw_stats,
+                                struct lprocfs_stats *stats)
+{
+       int i;
+
+       LASSERT(brw_stats);
+       brw_stats->bs_init = ktime_get();
+       for (i = 0; i < BRW_RW_STATS_NUM; i++) {
+               struct brw_stats_props *props = brw_stats->bs_props;
+
+               spin_lock_init(&brw_stats->bs_hist[i].oh_lock);
+               if (i % 2) {
+                       props[i / 2].bsp_name = brw_props[i / 2].bsp_name;
+                       props[i / 2].bsp_units = brw_props[i / 2].bsp_units;
+                       props[i / 2].bsp_scale = brw_props[i / 2].bsp_scale;
+               }
+       }
+
+       if (!parent)
+               return;
+
+       debugfs_create_file("brw_stats", 0644, parent, brw_stats,
+                           &brw_stats_fops);
+
+       if (stats)
+               debugfs_create_file("stats", 0644, parent, stats,
+                                   &ldebugfs_stats_seq_fops);
+}
+EXPORT_SYMBOL(ldebugfs_register_osd_stats);
+
 int lprocfs_hash_seq_show(struct seq_file *m, void *data)
 {
        struct obd_device *obd = m->private;
@@ -703,8 +838,11 @@ int lprocfs_recovery_status_seq_show(struct seq_file *m, void *data)
                goto out;
        }
 
-       /* sampled unlocked, but really... */
-       if (obd->obd_recovering == 0) {
+       /* There is gap between client data read from storage and setting
+        * obd_recovering so check obd_recovery_end as well to make sure
+        * recovery is really finished
+        */
+       if (obd->obd_recovery_end > 0 && !obd->obd_recovering) {
                seq_printf(m, "COMPLETE\n");
                seq_printf(m, "recovery_start: %lld\n",
                           (s64)ktime_get_real_seconds() -