diff options
| author | Sage Weil <sage@redhat.com> | 2019-09-04 21:02:20 +0200 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2019-09-06 04:29:56 +0200 |
| commit | 4878509652ab2ef7df1d35a8269e9265c6d71204 (patch) | |
| tree | 33abe146987be07dee77aefcf5f304eca5f10e98 /src/mgr/DaemonServer.h | |
| parent | Merge PR #29842 into master (diff) | |
| download | ceph-4878509652ab2ef7df1d35a8269e9265c6d71204.tar.xz ceph-4878509652ab2ef7df1d35a8269e9265c6d71204.zip | |
mgr: accept MMgrCommand[Reply] messages (in addition to MCommand[Reply])
MCommand is used both for tell-style commands and for CLI commands
implemented by the mgr. Allow the latter to be send via MMgrCommand
instead.
Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'src/mgr/DaemonServer.h')
| -rw-r--r-- | src/mgr/DaemonServer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mgr/DaemonServer.h b/src/mgr/DaemonServer.h index 14ed023f06b..d299aaa4ea1 100644 --- a/src/mgr/DaemonServer.h +++ b/src/mgr/DaemonServer.h @@ -36,6 +36,7 @@ class MMgrOpen; class MMgrClose; class MMonMgrReport; class MCommand; +class MMgrCommand; struct MonCommand; class CommandContext; struct OSDPerfMetricQuery; @@ -147,8 +148,8 @@ public: 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<MCommand>& m, - std::shared_ptr<CommandContext>& cmdctx); + 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(); |