From: Willem Jan Withagen Date: Wed, 26 Jul 2017 09:44:46 +0000 (+0200) Subject: common: make some message informative, instead of error X-Git-Tag: v13.0.0~129^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8241a322aadbed199ff9a308b3af1d0cc5cd04ed;p=ceph.git common: make some message informative, instead of error Signed-off-by: Willem Jan Withagen --- diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index f3d585b4775..3f26cc4c485 100644 --- 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 532fe2eae84..66890904c3e 100644 --- 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 #include 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; }