Correct fix for "Pool %u PG %u configuration is invalid" during startup

Establish watcher connection after loading PGs
2020-10-20 21:09:14 +00:00
parent d2b901aa09
commit 9abf3c17c9
3 changed files with 6 additions and 7 deletions
@@ -223,7 +223,7 @@ 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)
-    if (run_primary && !(peering_state & OSD_LOADING_PGS))
+    if (run_primary)
    {
        apply_pg_count();
        apply_pg_config();
@@ -273,7 +273,6 @@ void osd_t::on_load_config_hook(json11::Json::object & global_config)
    }
    parse_config(osd_config);
    bind_socket();
-    st_cli.start_etcd_watcher();
    acquire_lease();
 }