]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Make --get-journal-fsid not attempt aio or direct_io.
authorTommi Virtanen <tv@inktank.com>
Fri, 5 Oct 2012 16:08:56 +0000 (09:08 -0700)
committerTommi Virtanen <tv@inktank.com>
Fri, 5 Oct 2012 22:41:35 +0000 (15:41 -0700)
Signed-off-by: Tommi Virtanen <tv@inktank.com>
src/osd/OSD.cc

index 77833f6ea38d9407183d200d31b120ed58c608a8..3b1f2abe5f3fdcd141217726dca219db5fc70af3 100644 (file)
@@ -674,7 +674,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);
 }