]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: load OSD all compression settings unconditionally. 28895/head
authorIgor Fedotov <ifedotov@suse.com>
Fri, 21 Jun 2019 10:16:08 +0000 (13:16 +0300)
committerIgor Fedotov <ifedotov@suse.com>
Fri, 5 Jul 2019 09:16:57 +0000 (12:16 +0300)
Inititally we don't load them if OSD compression mode is set to none.
But we might need them when pool's compression is enabled but some
settings aren't set.

Fixes: http://tracker.ceph.com/issues/40480
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 187509ebf6bf913b65f0171013bf7c20279dadb4)

 Conflicts:
src/os/bluestore/BlueStore.cc
 trivial.

src/os/bluestore/BlueStore.cc

index 754eb975dcddc784bb31348cf31bc97617107be7..6dcb78e82728073b6fde307948bf88aad93ca432 100644 (file)
@@ -3854,12 +3854,6 @@ void BlueStore::_set_compression()
 
   compressor = nullptr;
 
-  if (comp_mode == Compressor::COMP_NONE) {
-    dout(10) << __func__ << " compression mode set to 'none', "
-             << "ignore other compression setttings" << dendl;
-    return;
-  }
-
   if (cct->_conf->bluestore_compression_min_blob_size) {
     comp_min_blob_size = cct->_conf->bluestore_compression_min_blob_size;
   } else {