]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
test/store_test: fix errors on the whole test suite run caused by the lack of properi... 11427/head
authorIgor Fedotov <ifedotov@mirantis.com>
Tue, 11 Oct 2016 14:11:51 +0000 (14:11 +0000)
committerIgor Fedotov <ifedotov@mirantis.com>
Tue, 11 Oct 2016 14:11:51 +0000 (14:11 +0000)
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
src/test/objectstore/store_test.cc

index 321a0d607adef512e3dc7fa6a68f065cec4026d2..a1ba02f11247b8630a11ca30b90bdcdbd137e138 100644 (file)
@@ -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);
 }