From: Sage Weil <sage@redhat.com>
Date: Thu, 6 Oct 2016 17:47:56 +0000 (-0400)
Subject: unittest_compression: restore zlib_isal setting
X-Git-Tag: v11.1.0~704^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46b67f3d177d10e7364df0a1302bc98641d5a832;p=ceph.git

unittest_compression: restore zlib_isal setting

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/compressor/test_compression.cc b/src/test/compressor/test_compression.cc
index 22e35c674159..1a18104c33b6 100644
--- a/src/test/compressor/test_compression.cc
+++ b/src/test/compressor/test_compression.cc
@@ -30,8 +30,12 @@ class CompressionTest : public ::testing::Test,
 public:
   std::string plugin;
   CompressorRef compressor;
+  bool old_zlib_isal;
 
   CompressionTest() {
+    // note for later
+    old_zlib_isal = g_conf->compressor_zlib_isal;
+
     plugin = GetParam();
     size_t pos = plugin.find('/');
     if (pos != std::string::npos) {
@@ -49,6 +53,10 @@ public:
     }
     cout << "[plugin " << plugin << " (" << GetParam() << ")]" << std::endl;
   }
+  ~CompressionTest() {
+    g_conf->set_val("compressor_zlib_isal", old_zlib_isal ? "true" : "false");
+    g_ceph_context->_conf->apply_changes(NULL);
+  }
 
   void SetUp() {
     compressor = Compressor::create(g_ceph_context, plugin);