From: Joao Eduardo Luis <joao@suse.de>
Date: Mon, 10 Aug 2015 13:45:34 +0000 (+0100)
Subject: mon: Monitor: set MMonJoin's op type as service
X-Git-Tag: v9.1.0~396^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c87130550b47754c679f9df9ef9173d078107bf6;p=ceph.git

mon: Monitor: set MMonJoin's op type as service

Otherwise, when the MonmapMonitor's PaxosService::dispatch() handles the
message, it will assert (as it should) because the op is marked as being
a monitor op. And this function should never handle monitor ops.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 0e2068b9890b..7e0887f7fd2f 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -3670,6 +3670,7 @@ void Monitor::dispatch_op(MonOpRequestRef op)
 
     // monmap
     case MSG_MON_JOIN:
+      op->set_type_service();
       paxos_service[PAXOS_MONMAP]->dispatch(op);
       break;