#include <set>
#include <string>
+#include <boost/variant.hpp>
-#include "common/Mutex.h"
+#include "common/ceph_mutex.h"
#include "common/LogClient.h"
#include "common/Timer.h"
#include "ServiceMap.h"
#include "MgrSession.h"
#include "DaemonState.h"
+#include "MetricCollector.h"
#include "OSDPerfMetricCollector.h"
class MMgrReport;
class MMgrClose;
class MMonMgrReport;
class MCommand;
+class MMgrCommand;
struct MonCommand;
class CommandContext;
struct OSDPerfMetricQuery;
epoch_t pending_service_map_dirty = 0;
- Mutex lock;
+ ceph::mutex lock = ceph::make_mutex("DaemonServer");
static void _generate_command_map(cmdmap_t& cmdmap,
map<string,string> ¶m_str_map);
static const MonCommand *_get_mgrcommand(const string &cmd_prefix,
const std::vector<MonCommand> &commands);
bool _allowed_command(
- MgrSession *s, const string &module, const string &prefix,
- const cmdmap_t& cmdmap,
+ MgrSession *s, const string &service, const string &module,
+ const string &prefix, const cmdmap_t& cmdmap,
const map<string,string>& param_str_map,
const MonCommand *this_cmd);
void tick();
void schedule_tick_locked(double delay_sec);
- class OSDPerfMetricCollectorListener :
- public OSDPerfMetricCollector::Listener {
+ class OSDPerfMetricCollectorListener : public MetricListener {
public:
OSDPerfMetricCollectorListener(DaemonServer *server)
: server(server) {
OSDPerfMetricCollector osd_perf_metric_collector;
void handle_osd_perf_metric_query_updated();
+ void handle_metric_payload(const OSDMetricPayload &payload) {
+ osd_perf_metric_collector.process_reports(payload);
+ }
+
+ void handle_metric_payload(const UnknownMetricPayload &payload) {
+ ceph_abort();
+ }
+
+ struct HandlePayloadVisitor : public boost::static_visitor<void> {
+ DaemonServer *server;
+
+ HandlePayloadVisitor(DaemonServer *server)
+ : server(server) {
+ }
+
+ template <typename MetricPayload>
+ inline void operator()(const MetricPayload &payload) const {
+ server->handle_metric_payload(payload);
+ }
+ };
+
+ void update_task_status(DaemonKey key,
+ const std::map<std::string,std::string>& task_status);
+
public:
int init(uint64_t gid, entity_addrvec_t client_addrs);
void shutdown();
LogChannelRef auditcl);
~DaemonServer() override;
- bool ms_dispatch(Message *m) override;
+ bool ms_dispatch2(const ceph::ref_t<Message>& m) override;
int ms_handle_authentication(Connection *con) override;
bool ms_handle_reset(Connection *con) override;
void ms_handle_remote_reset(Connection *con) override {}
bool ms_handle_refused(Connection *con) override;
- bool ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer) override;
- KeyStore *ms_get_auth1_authorizer_keystore() override;
-
- bool handle_open(MMgrOpen *m);
- bool handle_close(MMgrClose *m);
- bool handle_report(MMgrReport *m);
- bool handle_command(MCommand *m);
- bool _handle_command(MCommand *m, std::shared_ptr<CommandContext>& cmdctx);
+
+ void fetch_missing_metadata(const DaemonKey& key, const entity_addr_t& addr);
+ bool handle_open(const ceph::ref_t<MMgrOpen>& m);
+ bool handle_close(const ceph::ref_t<MMgrClose>& m);
+ bool handle_report(const ceph::ref_t<MMgrReport>& m);
+ bool handle_command(const ceph::ref_t<MCommand>& m);
+ bool handle_command(const ceph::ref_t<MMgrCommand>& m);
+ bool _handle_command(std::shared_ptr<CommandContext>& cmdctx);
void send_report();
void got_service_map();
void got_mgr_map();
void _send_configure(ConnectionRef c);
- OSDPerfMetricQueryID add_osd_perf_query(
+ MetricQueryID add_osd_perf_query(
const OSDPerfMetricQuery &query,
const std::optional<OSDPerfMetricLimit> &limit);
- int remove_osd_perf_query(OSDPerfMetricQueryID query_id);
- int get_osd_perf_counters(OSDPerfMetricQueryID query_id,
+ int remove_osd_perf_query(MetricQueryID query_id);
+ int get_osd_perf_counters(MetricQueryID query_id,
std::map<OSDPerfMetricKey, PerformanceCounters> *c);
virtual const char** get_tracked_conf_keys() const override;
const std::set <std::string> &changed) override;
void schedule_tick(double delay_sec);
+
+ void log_access_denied(std::shared_ptr<CommandContext>& cmdctx,
+ MgrSession* session, std::stringstream& ss);
+ void dump_pg_ready(ceph::Formatter *f);
};
#endif