From 09a9dcc0b7c4c79eda5633502f9a299ad4fda52f Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Fri, 21 Jun 2019 13:16:08 +0300 Subject: [PATCH] os/bluestore: load OSD all compression settings unconditionally. 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 (cherry picked from commit 187509ebf6bf913b65f0171013bf7c20279dadb4) Conflicts: src/os/bluestore/BlueStore.cc trivial. --- src/os/bluestore/BlueStore.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 754eb975dcdd..6dcb78e82728 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -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 { -- 2.47.3