From: Igor Fedotov <ifedotov@mirantis.com>
Date: Tue, 11 Oct 2016 14:11:51 +0000 (+0000)
Subject: test/store_test: fix errors on the whole test suite run caused by the lack of properi... 
X-Git-Tag: v11.1.0~667^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11427%2Fhead;p=ceph.git

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 <ifedotov@mirantis.com>
---

diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
index 321a0d607ade..a1ba02f11247 100644
--- a/src/test/objectstore/store_test.cc
+++ b/src/test/objectstore/store_test.cc
@@ -847,6 +847,7 @@ void doCompressionTest( boost::scoped_ptr<ObjectStore>& 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<ObjectStore>& 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);
 }