From: Samuel Just <sam.just@inktank.com>
Date: Mon, 18 Jun 2012 21:02:28 +0000 (-0700)
Subject: ceph_osd: move auto-upgrade to after fork
X-Git-Tag: v0.48argonaut~41
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b0e66b70cbbbb2e9ee9c7ad39b48825cf5e72ddc;p=ceph.git

ceph_osd: move auto-upgrade to after fork

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 6ced00268a0b..dc4e13f1958d 100644
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -255,16 +255,14 @@ int main(int argc, const char **argv)
   }
 
 
-  if (convertfilestore ||
-      g_conf->filestore_update_to >= (int)FileStore::on_disk_version) {
+  if (convertfilestore) {
     int err = OSD::convertfs(g_conf->osd_data, g_conf->osd_journal);
     if (err < 0) {
       derr << TEXT_RED << " ** ERROR: error converting store " << g_conf->osd_data
 	   << ": " << cpp_strerror(-err) << TEXT_NORMAL << dendl;
       exit(1);
     }
-    if (convertfilestore)
-      exit(0);
+    exit(0);
   }
   
   string magic;
@@ -400,6 +398,15 @@ int main(int argc, const char **argv)
   global_init_daemonize(g_ceph_context, CINIT_FLAG_NO_CLOSE_STDERR);
   common_init_finish(g_ceph_context);
 
+  if (g_conf->filestore_update_to >= (int)FileStore::on_disk_version) {
+    int err = OSD::convertfs(g_conf->osd_data, g_conf->osd_journal);
+    if (err < 0) {
+      derr << TEXT_RED << " ** ERROR: error converting store " << g_conf->osd_data
+	   << ": " << cpp_strerror(-err) << TEXT_NORMAL << dendl;
+      exit(1);
+    }
+  }
+
   MonClient mc(g_ceph_context);
   if (mc.build_initial_monmap() < 0)
     return -1;