From: Igor Fedotov <ifedotov@mirantis.com>
Date: Thu, 15 Sep 2016 12:36:15 +0000 (+0000)
Subject: os/bluestore: preserve compression mode even if per-store compression algorithm resul... 
X-Git-Tag: v11.1.0~539^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fec8f32d7f4c13ac1f863a520290d7c1a326ae6e;p=ceph.git

os/bluestore: preserve compression mode even if per-store compression algorithm resulted in none.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 179475364356..4cb5a0ccaa96 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -2558,18 +2558,13 @@ void BlueStore::_set_compression()
   }
 
   compressor = nullptr;
-  if (comp_mode.load() != Compressor::COMP_NONE) {    
 
-    auto& alg_name = g_conf->bluestore_compression_algorithm;
-
-    if (!alg_name.empty()) {
-      compressor = Compressor::create(cct, alg_name);
-      if (!compressor) {
-        derr << __func__ << " unable to initialize " << alg_name << " compressor"
-             << ", reverting compression mode to 'none'" 
-	     << dendl;
-        comp_mode = Compressor::COMP_NONE;
-      }
+  auto& alg_name = g_conf->bluestore_compression_algorithm;
+  if (!alg_name.empty()) {
+    compressor = Compressor::create(cct, alg_name);
+    if (!compressor) {
+      derr << __func__ << " unable to initialize " << alg_name.c_str() << " compressor"
+           << dendl;
     }
   }