common: make some message informative, instead of error

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index f3d585b47759a4d18b0c2600987edca7424d8ac8..3f26cc4c4852ae0056d327a91707b24257b1741f 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -285,8 +285,8 @@ int main(int argc, const char **argv)
           << g_conf->osd_data << ": " << cpp_strerror(-err) << TEXT_NORMAL << dendl;
       exit(1);
     }
-    derr << "created object store " << g_conf->osd_data
-        << " for osd." << whoami << " fsid " << mc.monmap.fsid << dendl;
+    dout(0) << "created object store " << g_conf->osd_data
+           << " for osd." << whoami << " fsid " << mc.monmap.fsid << dendl;
   }
   if (mkkey) {
     common_init_finish(g_ceph_context);

diff --git a/src/os/filestore/FileJournal.h b/src/os/filestore/FileJournal.h
index 532fe2eae84190ad0fdda54b3eeb212f666ac0d4..66890904c3eec1dd1e1486107aa0718d189be70b 100644 (file)
--- a/src/os/filestore/FileJournal.h
+++ b/src/os/filestore/FileJournal.h
@@ -16,6 +16,7 @@
 #ifndef CEPH_FILEJOURNAL_H
 #define CEPH_FILEJOURNAL_H
 
+#include <stdlib.h>
 #include <deque>
 using std::deque;
 
@@ -433,7 +434,7 @@ private:
         aio = false;
       }
 #ifndef HAVE_LIBAIO
-      if (aio) {
+      if (aio && ::getenv("CEPH_DEV") == NULL) {
        lderr(cct) << "FileJournal::_open_any: libaio not compiled in; disabling aio" << dendl;
         aio = false;
       }