From 776219ef6d7f67c7e83ccfeccbccde2d73a40a34 Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Tue, 11 Oct 2016 14:11:51 +0000 Subject: [PATCH] test/store_test: fix errors on the whole test suite run caused by the lack of properites restore in some test cases Signed-off-by: Igor Fedotov --- src/test/objectstore/store_test.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index 321a0d607adef..a1ba02f11247b 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -847,6 +847,7 @@ void doCompressionTest( boost::scoped_ptr& store) //force fsck EXPECT_EQ(store->umount(), 0); EXPECT_EQ(store->mount(), 0); + auto orig_min_blob_size = g_conf->bluestore_compression_min_blob_size; { g_conf->set_val("bluestore_compression_min_blob_size", "262144"); g_ceph_context->_conf->apply_changes(NULL); @@ -874,6 +875,8 @@ void doCompressionTest( boost::scoped_ptr& store) r = apply_transaction(store, &osr, std::move(t)); ASSERT_EQ(r, 0); } + g_conf->set_val("bluestore_compression_min_blob_size", stringify(orig_min_blob_size)); + g_ceph_context->_conf->apply_changes(NULL); } TEST_P(StoreTest, CompressionTest) { @@ -892,6 +895,7 @@ TEST_P(StoreTest, CompressionTest) { doCompressionTest(store); + g_conf->set_val("bluestore_compression_algorithm", "snappy"); g_conf->set_val("bluestore_compression", "none"); g_ceph_context->_conf->apply_changes(NULL); } -- 2.39.5