From: Adam Kupczyk <akupczyk@redhat.com>
Date: Wed, 22 Apr 2020 11:58:13 +0000 (+0200)
Subject: kv/RocksDBStore: Store RocksDB env
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1039^2~8
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0272d195bb36c135236a165c72052682776788b3;p=ceph-ci.git

kv/RocksDBStore: Store RocksDB env

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
---

diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
index 6aac85069e3..1693885c0c8 100644
--- a/src/kv/RocksDBStore.cc
+++ b/src/kv/RocksDBStore.cc
@@ -293,7 +293,7 @@ int RocksDBStore::ParseOptionsFromStringStatic(
         return -EINVAL;
       }
     }
-    lgeneric_dout(cct, 0) << " set rocksdb option " << it->first
+    lgeneric_dout(cct, 1) << " set rocksdb option " << it->first
       << " = " << it->second << dendl;
   }
   return 0;
@@ -411,6 +411,8 @@ int RocksDBStore::load_rocksdb_options(bool create_if_missing, rocksdb::Options&
   if (priv) {
     dout(10) << __func__ << " using custom Env " << priv << dendl;
     opt.env = static_cast<rocksdb::Env*>(priv);
+  } else {
+    env = opt.env;
   }
 
   opt.env->SetAllowNonOwnerAccess(false);