From: Tommi Virtanen <tv@inktank.com>
Date: Fri, 5 Oct 2012 16:08:56 +0000 (-0700)
Subject: osd: Make --get-journal-fsid not attempt aio or direct_io.
X-Git-Tag: v0.48.3argonaut~48^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f65daf3f24830a28e85ebe7c6fce2642f5fc6dd8;p=ceph.git

osd: Make --get-journal-fsid not attempt aio or direct_io.

Signed-off-by: Tommi Virtanen <tv@inktank.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 4648b99c842b..79ce18ba73f6 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -601,7 +601,10 @@ int OSD::peek_meta(const std::string &dev, std::string& magic,
 
 int OSD::peek_journal_fsid(string path, uuid_d& fsid)
 {
-  FileJournal j(fsid, 0, 0, path.c_str());
+  // make sure we don't try to use aio or direct_io (and get annoying
+  // error messages from failing to do so); performance implications
+  // should be irrelevant for this use
+  FileJournal j(fsid, 0, 0, path.c_str(), false, false);
   return j.peek_fsid(fsid);
 }