src/cmd/cli_osd_tree.cpp

@@ -40,14 +40,10 @@ struct osd_tree_printer_t
     cli_tool_t *parent;
     json11::Json cfg;
     bool flat = false;
-    bool show_stats = false;
 
     int state = 0;
     cli_result_t result;
 
-    json11::Json node_placement;
-    std::map<uint64_t, json11::Json> osd_config;
-    std::map<uint64_t, json11::Json> osd_stats;
     std::shared_ptr<placement_tree_t> placement_tree;
 
     bool is_done() { return state == 100; }
@@ -87,14 +83,17 @@ resume_1:
             state = 100;
             return;
         }
+        json11::Json node_placement;
         for (auto & item: parent->etcd_result["responses"][0]["response_range"]["kvs"].array_items())
         {
             node_placement = parent->cli->st_cli.parse_etcd_kv(item).value;
         }
+        std::map<uint64_t, json11::Json> osd_config;
         parent->iterate_kvs_1(parent->etcd_result["responses"][1]["response_range"]["kvs"], "/config/osd/", [&](uint64_t cur_osd, json11::Json value)
         {
             osd_config[cur_osd] = value;
         });
+        std::map<uint64_t, json11::Json> osd_stats;
         parent->iterate_kvs_1(parent->etcd_result["responses"][2]["response_range"]["kvs"], "/osd/stats/", [&](uint64_t cur_osd, json11::Json value)
         {
             osd_stats[cur_osd] = value;
@@ -221,7 +220,7 @@ resume_1:
             for (uint64_t osd_num: node.child_osds)
             {
                 auto & osd = placement_tree->osds.at(osd_num);
-                auto fmt = json11::Json::object{
+                fmt_items.push_back(json11::Json::object{
                     { "type", (flat ? "osd" : str_repeat("  ", indents[i]+1) + "osd") },
                     { "name", osd.num },
                     { "parent", parent },
@@ -233,21 +232,7 @@ resume_1:
                     { "block", format_size(osd.block_size, false, true) },
                     { "bitmap", format_size(osd.bitmap_granularity, false, true) },
                     { "commit", osd.immediate_commit == IMMEDIATE_NONE ? "none" : (osd.immediate_commit == IMMEDIATE_ALL ? "all" : "small") },
-                };
+                });
-                if (show_stats)
-                {
-                    auto op_stat = osd_stats[osd_num]["op_stats"];
-                    fmt["read_bw"] = format_size(op_stat["primary_read"]["bps"].uint64_value())+"/s";
-                    fmt["write_bw"] = format_size(op_stat["primary_write"]["bps"].uint64_value())+"/s";
-                    fmt["delete_bw"] = format_size(op_stat["primary_delete"]["bps"].uint64_value())+"/s";
-                    fmt["read_iops"] = format_q(op_stat["primary_read"]["iops"].uint64_value());
-                    fmt["write_iops"] = format_q(op_stat["primary_write"]["iops"].uint64_value());
-                    fmt["delete_iops"] = format_q(op_stat["primary_delete"]["iops"].uint64_value());
-                    fmt["read_lat"] = format_lat(op_stat["primary_read"]["lat"].uint64_value());
-                    fmt["write_lat"] = format_lat(op_stat["primary_write"]["lat"].uint64_value());
-                    fmt["delete_lat"] = format_lat(op_stat["primary_delete"]["lat"].uint64_value());
-                }
-                fmt_items.push_back(std::move(fmt));
             }
         }
         json11::Json::array cols;
@@ -301,45 +286,6 @@ resume_1:
             { "key", "commit" },
             { "title", "IMM" },
         });
-        if (show_stats)
-        {
-            cols.push_back(json11::Json::object{
-                { "key", "read_bw" },
-                { "title", "READ" },
-            });
-            cols.push_back(json11::Json::object{
-                { "key", "read_iops" },
-                { "title", "IOPS" },
-            });
-            cols.push_back(json11::Json::object{
-                { "key", "read_lat" },
-                { "title", "LAT" },
-            });
-            cols.push_back(json11::Json::object{
-                { "key", "write_bw" },
-                { "title", "WRITE" },
-            });
-            cols.push_back(json11::Json::object{
-                { "key", "write_iops" },
-                { "title", "IOPS" },
-            });
-            cols.push_back(json11::Json::object{
-                { "key", "write_lat" },
-                { "title", "LAT" },
-            });
-            cols.push_back(json11::Json::object{
-                { "key", "delete_bw" },
-                { "title", "DEL" },
-            });
-            cols.push_back(json11::Json::object{
-                { "key", "delete_iops" },
-                { "title", "IOPS" },
-            });
-            cols.push_back(json11::Json::object{
-                { "key", "delete_lat" },
-                { "title", "LAT" },
-            });
-        }
         return print_table(fmt_items, cols, parent->color);
     }
 
@@ -362,7 +308,6 @@ std::function<bool(cli_result_t &)> cli_tool_t::start_osd_tree(json11::Json cfg)
     osd_tree_printer->parent = this;
     osd_tree_printer->cfg = cfg;
     osd_tree_printer->flat = cfg["flat"].bool_value();
-    osd_tree_printer->show_stats = cfg["long"].bool_value();
     return [osd_tree_printer](cli_result_t & result)
     {
         osd_tree_printer->loop();

src/osd/osd.h

@@ -199,14 +199,12 @@ class osd_t
     ring_consumer_t consumer;
 
     // op statistics
-    osd_op_stats_t prev_stats, prev_report_stats;
+    osd_op_stats_t prev_stats;
-    timespec report_stats_ts;
     std::map<uint64_t, inode_stats_t> inode_stats;
     std::map<uint64_t, timespec> vanishing_inodes;
     const char* recovery_stat_names[2] = { "degraded", "misplaced" };
     recovery_stat_t recovery_stat[2];
     recovery_stat_t recovery_print_prev[2];
-    recovery_stat_t recovery_report_prev[2];
 
     // recovery auto-tuning
     int rtune_timer_id = -1;

src/osd/osd_cluster.cpp

@@ -180,12 +180,6 @@ json11::Json osd_t::get_statistics()
     json11::Json::object st;
     timespec ts;
     clock_gettime(CLOCK_REALTIME, &ts);
-    uint64_t ts_diff = 0;
-    if (report_stats_ts.tv_sec != 0)
-        ts_diff = (ts.tv_sec - report_stats_ts.tv_sec + (ts.tv_nsec - report_stats_ts.tv_nsec) / 1000000000);
-    if (!ts_diff)
-        ts_diff = 1;
-    report_stats_ts = ts;
     char time_str[50] = { 0 };
     sprintf(time_str, "%jd.%03ld", (uint64_t)ts.tv_sec, ts.tv_nsec/1000000);
     st["time"] = time_str;
@@ -202,50 +196,33 @@ json11::Json osd_t::get_statistics()
     json11::Json::object op_stats, subop_stats;
     for (int i = OSD_OP_MIN; i <= OSD_OP_MAX; i++)
     {
-        auto n = (msgr.stats.op_stat_count[i] - prev_report_stats.op_stat_count[i]);
         op_stats[osd_op_names[i]] = json11::Json::object {
             { "count", msgr.stats.op_stat_count[i] },
             { "usec", msgr.stats.op_stat_sum[i] },
             { "bytes", msgr.stats.op_stat_bytes[i] },
-            { "lat", (msgr.stats.op_stat_sum[i] - prev_report_stats.op_stat_sum[i]) / (n < 1 ? 1 : n) },
-            { "bps", (msgr.stats.op_stat_bytes[i] - prev_report_stats.op_stat_bytes[i]) / ts_diff },
-            { "iops", n / ts_diff },
         };
     }
     for (int i = OSD_OP_MIN; i <= OSD_OP_MAX; i++)
     {
-        auto n = (msgr.stats.subop_stat_count[i] - prev_report_stats.subop_stat_count[i]);
         subop_stats[osd_op_names[i]] = json11::Json::object {
             { "count", msgr.stats.subop_stat_count[i] },
             { "usec", msgr.stats.subop_stat_sum[i] },
-            { "lat", (msgr.stats.subop_stat_sum[i] - prev_report_stats.subop_stat_sum[i]) / (n < 1 ? 1 : n) },
-            { "iops", n / ts_diff },
         };
     }
     st["op_stats"] = op_stats;
     st["subop_stats"] = subop_stats;
-    auto n0 = recovery_stat[0].count - recovery_report_prev[0].count;
-    auto n1 = recovery_stat[1].count - recovery_report_prev[1].count;
     st["recovery_stats"] = json11::Json::object {
         { recovery_stat_names[0], json11::Json::object {
             { "count", recovery_stat[0].count },
             { "bytes", recovery_stat[0].bytes },
             { "usec", recovery_stat[0].usec },
-            { "lat", (recovery_stat[0].usec - recovery_report_prev[0].usec) / (n0 < 1 ? 1 : n0) },
-            { "bps", (recovery_stat[0].bytes - recovery_report_prev[0].bytes) / ts_diff },
-            { "iops", n0 / ts_diff },
         } },
         { recovery_stat_names[1], json11::Json::object {
             { "count", recovery_stat[1].count },
             { "bytes", recovery_stat[1].bytes },
             { "usec", recovery_stat[1].usec },
-            { "lat", (recovery_stat[1].usec - recovery_report_prev[1].usec) / (n1 < 1 ? 1 : n1) },
-            { "bps", (recovery_stat[1].bytes - recovery_report_prev[1].bytes) / ts_diff },
-            { "iops", n1 / ts_diff },
         } },
     };
-    prev_report_stats = msgr.stats;
-    memcpy(recovery_report_prev, recovery_stat, sizeof(recovery_stat));
     return st;
 }