update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / utilities / options / options_util.cc

diff --git a/ceph/src/rocksdb/utilities/options/options_util.cc b/ceph/src/rocksdb/utilities/options/options_util.cc
index 3975eadd75517409ab361e05e9fa1e94e1346b6a..0719798e31a0d28243709b860f194a9734dea3ea 100644 (file)
--- a/ceph/src/rocksdb/utilities/options/options_util.cc
+++ b/ceph/src/rocksdb/utilities/options/options_util.cc
@@ -7,18 +7,21 @@
 
 #include "rocksdb/utilities/options_util.h"
 
+#include "env/composite_env_wrapper.h"
+#include "file/filename.h"
 #include "options/options_parser.h"
 #include "rocksdb/options.h"
-#include "util/filename.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 Status LoadOptionsFromFile(const std::string& file_name, Env* env,
                            DBOptions* db_options,
                            std::vector<ColumnFamilyDescriptor>* cf_descs,
                            bool ignore_unknown_options,
                            std::shared_ptr<Cache>* cache) {
   RocksDBOptionsParser parser;
-  Status s = parser.Parse(file_name, env, ignore_unknown_options);
+  LegacyFileSystemWrapper fs(env);
+  Status s = parser.Parse(file_name, &fs, ignore_unknown_options,
+                          0 /* file_readahead_size */);
   if (!s.ok()) {
     return s;
   }
@@ -100,11 +103,12 @@ Status CheckOptionsCompatibility(
   }
 
   const OptionsSanityCheckLevel kDefaultLevel = kSanityLevelLooselyCompatible;
+  LegacyFileSystemWrapper fs(env);
 
   return RocksDBOptionsParser::VerifyRocksDBOptionsFromFile(
-      db_options, cf_names, cf_opts, dbpath + "/" + options_file_name, env,
+      db_options, cf_names, cf_opts, dbpath + "/" + options_file_name, &fs,
       kDefaultLevel, ignore_unknown_options);
 }
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE
 #endif  // !ROCKSDB_LITE