From: Samuel Just <samuel.just@dreamhost.com>
Date: Sat, 3 Sep 2011 01:02:10 +0000 (-0700)
Subject: cosd: Do filestore conversion after common_init_finish
X-Git-Tag: v0.35~110
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a10fba72ea0ff7a5954a6d1a1d108e4777697b7;p=ceph.git

cosd: Do filestore conversion after common_init_finish

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
---

diff --git a/src/cosd.cc b/src/cosd.cc
index 7ff132723a37..7e16deba766d 100644
--- a/src/cosd.cc
+++ b/src/cosd.cc
@@ -193,15 +193,13 @@ int main(int argc, const char **argv)
     exit(0);
   }
 
-  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) {
-    derr << "Converted Filestore " << g_conf->osd_data << dendl;
-    exit(0);
+    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);
+    }
   }
   
   string magic;
@@ -293,6 +291,14 @@ int main(int argc, const char **argv)
   // Leave stderr open in case we need to report errors.
   global_init_daemonize(g_ceph_context, CINIT_FLAG_NO_CLOSE_STDERR);
   common_init_finish(g_ceph_context);
+
+  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;