From 0f964d62dbc2cb21e762abde387e67abb2145b2d Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Sat, 31 Dec 2022 02:43:13 +0300 Subject: [PATCH] Add debug --- src/etcd_state_client.cpp | 1 + src/osd_cluster.cpp | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/etcd_state_client.cpp b/src/etcd_state_client.cpp index a753fabf..3232d0d1 100644 --- a/src/etcd_state_client.cpp +++ b/src/etcd_state_client.cpp @@ -867,6 +867,7 @@ void etcd_state_client_t::parse_state(const etcd_kv_t & kv) } else { + fprintf(stderr, "RECEIVED PG %u/%u HISTORY: %s\n", pool_id, pg_num, value.dump().c_str()); auto & pg_cfg = this->pool_config[pool_id].pg_config[pg_num]; pg_cfg.target_history.clear(); pg_cfg.all_peers.clear(); diff --git a/src/osd_cluster.cpp b/src/osd_cluster.cpp index 005dca69..ceecd07d 100644 --- a/src/osd_cluster.cpp +++ b/src/osd_cluster.cpp @@ -694,6 +694,20 @@ void osd_t::apply_pg_config() } else { + printf( + "Repeer %u/%u because of history: %s vs %s\n", + pool_id, pg_num, + json11::Json(json11::Json::object { + { "target_set", pg_cfg.target_set }, + { "osd_sets", pg_cfg.target_history }, + { "all_peers", vec_all_peers }, + }).dump().c_str(), + json11::Json(json11::Json::object { + { "target_set", pg_it->second.target_set }, + { "osd_sets", pg_it->second.target_history }, + { "all_peers", pg_it->second.all_peers }, + }).dump().c_str() + ); // Stop PG, reapply change after stopping stop_pg(pg_it->second); all_applied = false; @@ -871,6 +885,7 @@ void osd_t::report_pg_states() { "all_peers", pg.all_peers }, { "osd_sets", pg.target_history }, }; + printf("PG %u/%u HISTORY -> %s\n", pg.pool_id, pg.pg_num, json11::Json(history_value).dump().c_str()); checks.push_back(json11::Json::object { { "target", "MOD" }, { "key", history_key },