From: Sage Weil <sage@redhat.com>
Date: Mon, 4 Jan 2016 17:54:06 +0000 (-0500)
Subject: os/bluestore/BlueFS: keep bool random in FileReader
X-Git-Tag: v10.0.3~88^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e04973bbdca88ee0f138c97705ffbc14a4d6617a;p=ceph.git

os/bluestore/BlueFS: keep bool random in FileReader

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
index 2d24c283d49..09320a22c47 100644
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@ -340,6 +340,7 @@ int BlueFS::_replay()
 
   FileReader *log_reader = new FileReader(
     log_file, g_conf->bluefs_alloc_size,
+    false,  // !random
     true);  // ignore eof
   while (true) {
     assert((log_reader->buf.pos & ~super.block_mask()) == 0);
@@ -1266,7 +1267,8 @@ int BlueFS::open_for_read(
   }
   File *file = q->second.get();
 
-  *h = new FileReader(file, random ? 4096 : g_conf->bluefs_max_prefetch);
+  *h = new FileReader(file, random ? 4096 : g_conf->bluefs_max_prefetch,
+		      random, false);
   dout(10) << __func__ << " h " << *h << " on " << file->fnode << dendl;
   return 0;
 }
diff --git a/src/os/bluestore/BlueFS.h b/src/os/bluestore/BlueFS.h
index 2ce5ec331b8..5fb703964e8 100644
--- a/src/os/bluestore/BlueFS.h
+++ b/src/os/bluestore/BlueFS.h
@@ -127,11 +127,13 @@ public:
   struct FileReader {
     FileRef file;
     FileReaderBuffer buf;
+    bool random;
     bool ignore_eof;        ///< used when reading our log file
 
-    FileReader(FileRef f, uint64_t mpf, bool ie = false)
+    FileReader(FileRef f, uint64_t mpf, bool rand, bool ie)
       : file(f),
 	buf(mpf),
+	random(rand),
 	ignore_eof(ie) {
       file->num_readers.inc();
     }