From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Fri, 3 Jun 2016 16:32:22 +0000 (+0800)
Subject: os/bluestore/BlueStore: Don't support dynamic set wal_apply mode.
X-Git-Tag: v11.0.0~301^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ee99d609e06570f5d3a096ea379388bd4a4d024;p=ceph.git

os/bluestore/BlueStore: Don't support dynamic set wal_apply mode.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 496997eb65f0..bb03a266354c 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -936,7 +936,8 @@ BlueStore::BlueStore(CephContext *cct, const string& path)
     kv_stop(false),
     logger(NULL),
     csum_type(bluestore_blob_t::CSUM_CRC32C),
-    min_alloc_size(0)
+    min_alloc_size(0),
+    sync_wal_apply(cct->_conf->bluestore_sync_wal_apply)
 {
   _init_logger();
   g_ceph_context->_conf->add_observer(this);
@@ -4229,7 +4230,7 @@ void BlueStore::_txc_state_proc(TransContext *txc)
       txc->log_state_latency(logger, l_bluestore_state_kv_done_lat);
       if (txc->wal_txn) {
 	txc->state = TransContext::STATE_WAL_QUEUED;
-	if (g_conf->bluestore_sync_wal_apply) {
+	if (sync_wal_apply) {
 	  _wal_apply(txc);
 	} else {
 	  wal_wq.queue(txc);
diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index 6026d9d66eac..2b3bfdc6dbf9 100644
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -822,6 +822,8 @@ private:
 
   uint64_t min_alloc_size; ///< minimum allocation unit (power of 2)
 
+  bool sync_wal_apply;	  ///< see config option bluestore_sync_wal_apply
+
   // compression options
   enum CompressionMode {
     COMP_NONE,                  ///< compress never