]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: preserve compression mode even if per-store compression algorithm resul...
authorIgor Fedotov <ifedotov@mirantis.com>
Thu, 15 Sep 2016 12:36:15 +0000 (12:36 +0000)
committerIgor Fedotov <ifedotov@mirantis.com>
Wed, 19 Oct 2016 14:33:29 +0000 (14:33 +0000)
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
src/os/bluestore/BlueStore.cc

index 179475364356b5e1e5eebbcaf11fed2335338fa9..4cb5a0ccaa967129e04d5c7a72a21dc9d727363c 100644 (file)
@@ -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;
     }
   }