Split etcd_stats_interval out of etcd_report_interval

src/osd.cpp

@@ -160,6 +160,9 @@ void osd_t::parse_config(bool init)
         etcd_report_interval = config["etcd_report_interval"].uint64_value();
         if (etcd_report_interval <= 0)
             etcd_report_interval = 5;
+        etcd_stats_interval = config["etcd_stats_interval"].uint64_value();
+        if (etcd_stats_interval <= 0)
+            etcd_stats_interval = 30;
         readonly = json_is_true(config["readonly"]);
         run_primary = !json_is_false(config["run_primary"]);
         allow_test_ops = json_is_true(config["allow_test_ops"]);

src/osd.h

@@ -93,6 +93,7 @@ class osd_t
 
     json11::Json::object cli_config, file_config, etcd_global_config, etcd_osd_config, config;
     int etcd_report_interval = 5;
+    int etcd_stats_interval = 30;
 
     bool readonly = false;
     osd_num_t osd_num = 1; // OSD numbers start with 1

src/osd_cluster.cpp

@@ -429,14 +429,18 @@ void osd_t::acquire_lease()
         create_osd_state();
     });
     printf(
-        "[OSD %lu] reporting to etcd at %s every %d seconds\n", this->osd_num,
+        "[OSD %lu] reporting to etcd at %s every %d seconds (statistics every %d seconds)\n", this->osd_num,
         (config["etcd_address"].is_string() ? config["etcd_address"].string_value() : config["etcd_address"].dump()).c_str(),
-        etcd_report_interval
+        etcd_report_interval, etcd_stats_interval
     );
     tfd->set_timer(etcd_report_interval*1000, true, [this](int timer_id)
     {
         renew_lease(false);
     });
+    tfd->set_timer(etcd_stats_interval*1000, true, [this](int timer_id)
+    {
+        report_statistics();
+    });
 }
 
 // Report "up" state once, then keep it alive using the lease
@@ -541,7 +545,6 @@ void osd_t::renew_lease(bool reload)
         else
         {
             etcd_failed_attempts = 0;
-            report_statistics();
             // Reload PGs
             if (reload && run_primary)
             {