From: David Zafman <dzafman@redhat.com>
Date: Fri, 6 Mar 2015 00:13:50 +0000 (-0800)
Subject: test: ceph_test_filejournal need to force aio because testing with a file
X-Git-Tag: v0.94.7~28^2~11^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c161cbf81a29e523bb4ffb897f6d02112eb49b09;p=ceph.git

test: ceph_test_filejournal need to force aio because testing with a file

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit d540dde1faee47d01ee358ae384fa301fa59f00f)
---

diff --git a/src/test/test_filejournal.cc b/src/test/test_filejournal.cc
index 734cb9a12c354..daa7f1e90759e 100644
--- a/src/test/test_filejournal.cc
+++ b/src/test/test_filejournal.cc
@@ -19,6 +19,7 @@ char path[200];
 uuid_d fsid;
 bool directio = false;
 bool aio = false;
+bool faio = false;
 
 // ----
 Cond cond;
@@ -107,6 +108,7 @@ int main(int argc, char **argv) {
     if (r >= 0) {
       cout << "DIRECTIO ON  AIO ON" << std::endl;
       aio = true;
+      faio = true;
       r = RUN_ALL_TESTS();
     }
   }
@@ -120,13 +122,13 @@ int main(int argc, char **argv) {
 
 TEST(TestFileJournal, Create) {
   fsid.generate_random();
-  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio);
+  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio, faio);
   ASSERT_EQ(0, j.create());
 }
 
 TEST(TestFileJournal, WriteSmall) {
   fsid.generate_random();
-  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio);
+  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio, faio);
   ASSERT_EQ(0, j.create());
   j.make_writeable();
 
@@ -140,7 +142,7 @@ TEST(TestFileJournal, WriteSmall) {
 
 TEST(TestFileJournal, WriteBig) {
   fsid.generate_random();
-  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio);
+  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio, faio);
   ASSERT_EQ(0, j.create());
   j.make_writeable();
 
@@ -158,7 +160,7 @@ TEST(TestFileJournal, WriteBig) {
 
 TEST(TestFileJournal, WriteMany) {
   fsid.generate_random();
-  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio);
+  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio, faio);
   ASSERT_EQ(0, j.create());
   j.make_writeable();
 
@@ -181,7 +183,7 @@ TEST(TestFileJournal, WriteMany) {
 
 TEST(TestFileJournal, WriteManyVecs) {
   fsid.generate_random();
-  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio);
+  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio, faio);
   ASSERT_EQ(0, j.create());
   j.make_writeable();
 
@@ -218,7 +220,7 @@ TEST(TestFileJournal, WriteManyVecs) {
 
 TEST(TestFileJournal, ReplaySmall) {
   fsid.generate_random();
-  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio);
+  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio, faio);
   ASSERT_EQ(0, j.create());
   j.make_writeable();
   
@@ -263,7 +265,7 @@ TEST(TestFileJournal, ReplaySmall) {
 
 TEST(TestFileJournal, ReplayCorrupt) {
   fsid.generate_random();
-  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio);
+  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio, faio);
   ASSERT_EQ(0, j.create());
   j.make_writeable();
   
@@ -330,7 +332,7 @@ TEST(TestFileJournal, ReplayCorrupt) {
 
 TEST(TestFileJournal, WriteTrim) {
   fsid.generate_random();
-  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio);
+  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio, faio);
   ASSERT_EQ(0, j.create());
   j.make_writeable();
 
@@ -370,7 +372,7 @@ TEST(TestFileJournal, WriteTrim) {
 
 TEST(TestFileJournal, WriteTrimSmall) {
   fsid.generate_random();
-  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio);
+  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio, faio);
   ASSERT_EQ(0, j.create());
   j.make_writeable();
 
@@ -413,7 +415,7 @@ TEST(TestFileJournal, ReplayDetectCorruptFooterMagic) {
   g_ceph_context->_conf->apply_changes(NULL);
 
   fsid.generate_random();
-  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio);
+  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio, faio);
   ASSERT_EQ(0, j.create());
   j.make_writeable();
 
@@ -463,7 +465,7 @@ TEST(TestFileJournal, ReplayDetectCorruptPayload) {
   g_ceph_context->_conf->apply_changes(NULL);
 
   fsid.generate_random();
-  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio);
+  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio, faio);
   ASSERT_EQ(0, j.create());
   j.make_writeable();
 
@@ -513,7 +515,7 @@ TEST(TestFileJournal, ReplayDetectCorruptHeader) {
   g_ceph_context->_conf->apply_changes(NULL);
 
   fsid.generate_random();
-  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio);
+  FileJournal j(fsid, finisher, &sync_cond, path, directio, aio, faio);
   ASSERT_EQ(0, j.create());
   j.make_writeable();