mon: Monitor: clearer output on error during attempt to convert store

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 6a61f3e4983..4a4df8942e9 100644
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -224,8 +224,14 @@ int main(int argc, const char **argv)
 
   {
     Monitor::StoreConverter converter(g_conf->mon_data);
-    if (converter.needs_conversion())
+    int ret = converter.needs_conversion();
+    if (ret > 0) {
       assert(!converter.convert());
+    } else if (ret < 0) {
+      derr << "found errors while attempting to convert the monitor store: "
+           << cpp_strerror(ret) << dendl;
+      exit(1);
+    }
   }
 
   MonitorDBStore store(g_conf->mon_data);
@@ -233,7 +239,6 @@ int main(int argc, const char **argv)
   if (err < 0) {
     cerr << argv[0] << ": error opening mon data store at '"
          << g_conf->mon_data << "': " << cpp_strerror(err) << std::endl;
-    cerr << "Have you run '--mkfs'?" << std::endl;
     exit(1);
   }
   assert(err == 0);