RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 17:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

crimson/osd: mark dump_detail() private

Browse Source 
Blocker::dump_detail() is called by Blocker::dump(), the latter is a
member of Blocker. so there is no need to mark dump_detail() protected
or public to grant the access Blocker::dump() the access to this method.

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2020-10-03 18:53:23 +08:00
parent a8b35f00cc
commit 3a93bc2d43
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/crimson/osd/osd_operation.h
View File

@ -118,40 +118,37 @@ make_exception_blocking_future(Exception&& e) {
* why a particular op is not making progress.
*/
class Blocker {
protected:
virtual void dump_detail(ceph::Formatter *f) const = 0;
public:
template <typename... T>
blocking_future<T...> make_blocking_future(seastar::future<T...> &&f) {
return blocking_future<T...>(this, std::move(f));
}
void dump(ceph::Formatter *f) const;
virtual const char *get_type_name() const = 0;
virtual ~Blocker() = default;
private:
virtual void dump_detail(ceph::Formatter *f) const = 0;
virtual const char *get_type_name() const = 0;
};
template <typename T>
class BlockerT : public Blocker {
public:
virtual ~BlockerT() = default;
private:
const char *get_type_name() const final {
return T::type_name;
}
virtual ~BlockerT() = default;
};
class AggregateBlocker : public BlockerT<AggregateBlocker> {
vector<Blocker*> parent_blockers;
protected:
void dump_detail(ceph::Formatter *f) const final;
public:
AggregateBlocker(vector<Blocker*> &&parent_blockers)
: parent_blockers(std::move(parent_blockers)) {}
static constexpr const char *type_name = "AggregateBlocker";
private:
void dump_detail(ceph::Formatter *f) const final;
};
template <typename T>
@ -352,11 +349,13 @@ public:
return seastar::make_ready_future<>();
});
}
protected:
private:
void dump_detail(Formatter *f) const final;
const char *get_type_name() const final {
return "OperationThrottler";
}
private:
crimson::osd::scheduler::SchedulerRef scheduler;
@ -381,8 +380,8 @@ private:
* the op ordering is preserved.
*/
class OrderedPipelinePhase : public Blocker {
protected:
virtual void dump_detail(ceph::Formatter *f) const final;
private:
void dump_detail(ceph::Formatter *f) const final;
const char *get_type_name() const final {
return name;
}

1
src/crimson/osd/osdmap_gate.h
View File

@ -37,6 +37,7 @@ class OSDMapGate {
seastar::shared_promise<epoch_t> promise;
void dump_detail(Formatter *f) const final;
private:
const char *get_type_name() const final {
return type_name;
}