diff options
| author | Sage Weil <sage@newdream.net> | 2012-02-28 09:11:59 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2012-02-28 09:11:59 -0800 |
| commit | a7de459f6937aaecfb9413db21b392780fe105fb (patch) | |
| tree | 03c95135fb2bf25c916e0358f6847df22ef4df6d | |
| parent | 97926e184629d25b3dbf57eda66b65c28ff29e02 (diff) | |
| download | ceph-a7de459f6937aaecfb9413db21b392780fe105fb.tar.gz | |
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>
| -rw-r--r-- | src/ceph_osd.cc | 4 | ||||
| -rw-r--r-- | src/osd/OSD.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index a99cc7b99b3..6ba7b76ca93 100644 --- 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 99d41bba5d8..919f9d8e69b 100644 --- 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); |