thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup PG_INCOMPLETE peering states

Browse Source
This commit is contained in:
Vitaliy Filippov
2025-05-10 02:51:26 +03:00
parent 0cb8629ab6
commit 66dc116f60
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/osd/osd_peering.cpp
+2 -6
View File
@@ -215,8 +215,7 @@ void osd_t::start_pg_peering(pg_t & pg)
{ {
// Wait until all OSDs are either connected or their /osd/state disappears from etcd // Wait until all OSDs are either connected or their /osd/state disappears from etcd
pg.state = PG_INCOMPLETE; pg.state = PG_INCOMPLETE;
report_pg_state(pg); // Fall through to cleanup list results
return;
} }
// Calculate current write OSD set // Calculate current write OSD set
pg.pg_cursize = 0; pg.pg_cursize = 0;
@@ -242,8 +241,6 @@ void osd_t::start_pg_peering(pg_t & pg)
// because such PGs don't flush unstable entries on secondary OSDs so they can't remove these // because such PGs don't flush unstable entries on secondary OSDs so they can't remove these
// entries from their journals... // entries from their journals...
pg.state = PG_INCOMPLETE; pg.state = PG_INCOMPLETE;
report_pg_state(pg);
return;
} }
std::set<osd_num_t> cur_peers; std::set<osd_num_t> cur_peers;
std::set<osd_num_t> dead_peers; std::set<osd_num_t> dead_peers;
@@ -278,8 +275,6 @@ void osd_t::start_pg_peering(pg_t & pg)
if (nonzero >= pg.pg_data_size && found < pg.pg_data_size) if (nonzero >= pg.pg_data_size && found < pg.pg_data_size)
{ {
pg.state = PG_INCOMPLETE; pg.state = PG_INCOMPLETE;
report_pg_state(pg);
return;
} }
} }
} }
@@ -318,6 +313,7 @@ void osd_t::start_pg_peering(pg_t & pg)
delete pg.peering_state; delete pg.peering_state;
pg.peering_state = NULL; pg.peering_state = NULL;
} }
report_pg_state(pg);
return; return;
} }
if (!pg.peering_state) if (!pg.peering_state)