RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-11 05:29:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd/: remove remaining scrubber references from PeeringState

Browse Source 
Signed-off-by: sjust@redhat.com <sjust@redhat.com>
This commit is contained in:
Samuel Just 2019-03-28 15:31:14 -07:00 committed by sjust@redhat.com
parent 5ec8f6863b
commit 6fd7b5a1bd
4 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/osd/PG.cc
View File

@ -6170,6 +6170,28 @@ void PG::handle_query_state(Formatter *f)
dout(10) << "handle_query_state" << dendl;
PeeringState::QueryState q(f);
recovery_state.handle_event(q, 0);
if (is_primary() && is_active()) {
f->open_object_section("scrub");
f->dump_stream("scrubber.epoch_start") << scrubber.epoch_start;
f->dump_bool("scrubber.active", scrubber.active);
f->dump_string("scrubber.state", PG::Scrubber::state_string(scrubber.state));
f->dump_stream("scrubber.start") << scrubber.start;
f->dump_stream("scrubber.end") << scrubber.end;
f->dump_stream("scrubber.max_end") << scrubber.max_end;
f->dump_stream("scrubber.subset_last_update") << scrubber.subset_last_update;
f->dump_bool("scrubber.deep", scrubber.deep);
{
f->open_array_section("scrubber.waiting_on_whom");
for (set<pg_shard_t>::iterator p = scrubber.waiting_on_whom.begin();
p != scrubber.waiting_on_whom.end();
++p) {
f->dump_stream("shard") << *p;
}
f->close_section();
}
f->close_section();
}
}
void PG::on_pool_change()

2
src/osd/PG.h
View File

@ -940,7 +940,7 @@ protected:
void _update_calc_stats();
void _update_blocked_by();
friend class TestOpsSocketHook;
void publish_stats_to_osd();
void publish_stats_to_osd() override;
bool needs_recovery() const;
bool needs_backfill() const;

22
src/osd/PeeringState.cc
View File

@ -2443,28 +2443,6 @@ boost::statechart::result PeeringState::Active::react(const QueryState& q)
q.f->close_section();
}
{
q.f->open_object_section("scrub");
q.f->dump_stream("scrubber.epoch_start") << pg->scrubber.epoch_start;
q.f->dump_bool("scrubber.active", pg->scrubber.active);
q.f->dump_string("scrubber.state", PG::Scrubber::state_string(pg->scrubber.state));
q.f->dump_stream("scrubber.start") << pg->scrubber.start;
q.f->dump_stream("scrubber.end") << pg->scrubber.end;
q.f->dump_stream("scrubber.max_end") << pg->scrubber.max_end;
q.f->dump_stream("scrubber.subset_last_update") << pg->scrubber.subset_last_update;
q.f->dump_bool("scrubber.deep", pg->scrubber.deep);
{
q.f->open_array_section("scrubber.waiting_on_whom");
for (set<pg_shard_t>::iterator p = pg->scrubber.waiting_on_whom.begin();
p != pg->scrubber.waiting_on_whom.end();
++p) {
q.f->dump_stream("shard") << *p;
}
q.f->close_section();
}
q.f->close_section();
}
q.f->close_section();
return forward_event();
}

1
src/osd/PeeringState.h
View File

@ -84,6 +84,7 @@ public:
virtual void queue_want_pg_temp(const vector<int> &wanted) = 0;
virtual void clear_want_pg_temp() = 0;
virtual void publish_stats_to_osd() = 0;
virtual void clear_publish_stats() = 0;
virtual void check_recovery_sources(const OSDMapRef& newmap) = 0;