ceph-osd: clarify error messages

So we know where the error came from.  And use real error codes in init().

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index a99cc7b99b3210162e21bcecd2e406cb69cd9753..6ba7b76ca93bd34afa1430cd058b8ebbac31d801 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -390,7 +390,7 @@ int main(int argc, const char **argv)
                g_conf->osd_data, g_conf->osd_journal);
   err = osd->pre_init();
   if (err < 0) {
-    derr << TEXT_RED << " ** ERROR: initializing osd failed: " << cpp_strerror(-err)
+    derr << TEXT_RED << " ** ERROR: osd pre_init failed: " << cpp_strerror(-err)
         << TEXT_NORMAL << dendl;
     return 1;
   }
@@ -412,7 +412,7 @@ int main(int argc, const char **argv)
   // start osd
   err = osd->init();
   if (err < 0) {
-    derr << TEXT_RED << " ** ERROR: initializing osd failed: " << cpp_strerror(-err)
+    derr << TEXT_RED << " ** ERROR: osd init failed: " << cpp_strerror(-err)
          << TEXT_NORMAL << dendl;
     return 1;
   }

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 99d41bba5d85503f72df19544057c0cefa859854..919f9d8e69b46bf07119649422f696799e942ad7 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -668,7 +668,7 @@ int OSD::init()
     derr << "OSD::init() : unable to read osd superblock" << dendl;
     store->umount();
     delete store;
-    return -1;
+    return -EINVAL;
   }
 
   class_handler = new ClassHandler();
@@ -680,7 +680,7 @@ int OSD::init()
   assert_warn(!osdmap);
   if (osdmap) {
     derr << "OSD::init: unable to read current osdmap" << dendl;
-    return -1;
+    return -EINVAL;
   }
   osdmap = get_map(superblock.current_epoch);