From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 1 Mar 2019 04:37:13 +0000 (-0800)
Subject: Merge PR #26638 into master
X-Git-Tag: v14.1.1~93
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1f5892f82046ebaac3b66dbd8e686825ebb1775c;p=ceph.git

Merge PR #26638 into master

* refs/pull/26638/head:
	doc: update documentation for standby-replay
	qa: update discontinous map test to use mds freezing
	mon: add freeze MDS command
	qa: update testing for standby-replay
	mon: add setting for fs to enable standby-replay
	ceph-mds: obsolete hot-standby option
	fs: obsolete standby_for config options
	messages/MMDSBeacon: use inline init
	mds: avoid unnecessary copy of entity_addrvec_t
	mds: use inline init for mds_info_t
	mds: use rank from MDSMap always
	mds: remove obsolete comment
	qa: use SIGTERM when stopping vstart service

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
---

1f5892f82046ebaac3b66dbd8e686825ebb1775c
diff --cc src/mon/MDSMonitor.h
index fa918e443f9,367f3c7d92e..9f415fc2444
--- a/src/mon/MDSMonitor.h
+++ b/src/mon/MDSMonitor.h
@@@ -26,10 -26,14 +26,11 @@@
  #include "PaxosService.h"
  #include "msg/Messenger.h"
  #include "messages/MMDSBeacon.h"
+ #include "CommandHandler.h"
  
 -class MMonCommand;
 -class MMDSLoadTargets;
 -class MMDSMap;
  class FileSystemCommandHandler;
  
- class MDSMonitor : public PaxosService, public PaxosFSMap {
+ class MDSMonitor : public PaxosService, public PaxosFSMap, protected CommandHandler {
   public:
    MDSMonitor(Monitor *mn, Paxos *p, string service_name);