]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #26638 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 1 Mar 2019 04:37:13 +0000 (20:37 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 1 Mar 2019 04:37:13 +0000 (20:37 -0800)
* 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>
1  2 
doc/releases/nautilus.rst
src/common/options.cc
src/mon/MDSMonitor.h
src/mon/MonCommands.h

Simple merge
Simple merge
index fa918e443f9d4fa290a6f5a8e49347967c2d04cf,367f3c7d92e7dbaca3eb42ffd90b43be0d6cfbd3..9f415fc24445bd87b79d2b2cdea3c1d7be35e453
  #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);
  
Simple merge