Do not handle change events before loading config

3 years ago · 70612e5df0
parent d952c24979
commit 70612e5df0
1 changed files with 5 additions and 2 deletions
--- a/osd_cluster.cpp
+++ b/osd_cluster.cpp
@ -223,8 +223,11 @@ void osd_t::on_change_osd_state_hook(osd_num_t peer_osd)
 void osd_t::on_change_etcd_state_hook(json11::Json::object & changes)
 {
    // FIXME apply config changes in runtime (maybe, some)
-    apply_pg_count();
-    apply_pg_config();
+    if (run_primary && !(peering_state & OSD_LOADING_PGS))
+    {
+        apply_pg_count();
+        apply_pg_config();
+    }
 }

 void osd_t::on_change_pg_history_hook(pool_id_t pool_id, pg_num_t pg_num)