]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: Monitor: set MMonJoin's op type as service
authorJoao Eduardo Luis <joao@suse.de>
Mon, 10 Aug 2015 13:45:34 +0000 (14:45 +0100)
committerJoao Eduardo Luis <joao@suse.de>
Mon, 10 Aug 2015 17:21:31 +0000 (18:21 +0100)
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>
src/mon/Monitor.cc

index 0e2068b9890b64473ee262fd4a714563fe76d52f..7e0887f7fd2fd7c07bb38cc0d45daf6a84210a94 100644 (file)
@@ -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;