From: Sage Weil <sage@inktank.com>
Date: Fri, 3 May 2013 23:20:26 +0000 (-0700)
Subject: mon: fix init sequence when not daemonizing
X-Git-Tag: v0.61~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a67f7b3ac3c035d6e4b2181fbad903aa4b03711;p=ceph.git

mon: fix init sequence when not daemonizing

We made the common_init_finish and chdir conditional on daemonize in commit
2e0dd5ae6c8751e33d456b2b06c1204b63db959a, breaking init (asok at least)
when -f is specified (as with upstart).

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 0189a319b5df..28e897e961a9 100644
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -283,9 +283,9 @@ int main(int argc, const char **argv)
       return prefork.parent_wait();
     }
     global_init_postfork(g_ceph_context, 0);
-    common_init_finish(g_ceph_context);
-    global_init_chdir(g_ceph_context);
   }
+  common_init_finish(g_ceph_context);
+  global_init_chdir(g_ceph_context);
 
   {
     Monitor::StoreConverter converter(g_conf->mon_data);