From: Greg Farnum <gfarnum@redhat.com>
Date: Tue, 26 Jan 2016 19:14:04 +0000 (-0800)
Subject: Merge branch 'wip-14374' of git://github.com/jcsp/ceph into greg-fs-testing
X-Git-Tag: v10.0.4~137^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ec5adcdcfce5ef675be0fa88c3806dd27a8deb7;p=ceph.git

Merge branch 'wip-14374' of git://github.com/jcsp/ceph into greg-fs-testing

https://github.com/ceph/ceph/pull/7295

Reviewed-by: Yan, Zheng <zyan@redhat.com>

Conflicts:
	src/mds/MDSDaemon.cc

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
---

0ec5adcdcfce5ef675be0fa88c3806dd27a8deb7
diff --cc src/mds/MDSDaemon.cc
index 4b562b27dbdb,b38b6c9a6cc4..dfd744cf1681
--- a/src/mds/MDSDaemon.cc
+++ b/src/mds/MDSDaemon.cc
@@@ -499,9 -476,7 +499,7 @@@ int MDSDaemon::init(MDSMap::DaemonStat
    // Set up admin socket before taking mds_lock, so that ordering
    // is consistent (later we take mds_lock within asok callbacks)
    set_up_admin_socket();
--
 +  g_conf->add_observer(this);
- 
    mds_lock.Lock();
    if (beacon.get_want_state() == MDSMap::STATE_DNE) {
      suicide();  // we could do something more graceful here
@@@ -549,7 -524,9 +547,7 @@@
    
    // schedule tick
    reset_tick();
--
+   g_conf->add_observer(this);
 -
    mds_lock.Unlock();
  
    return 0;