disable ignore_unknown_options only for lower version (#256)

Only enable force option check when reading options file from lower version. Signed-off-by: tabokie <xy.tao@outlook.com>
tikv · Sep 17, 2021 · f236fe4 · f236fe4
1 parent 24213c4
commit f236fe4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/options/options_parser.cc b/options/options_parser.cc
@@ -244,11 +244,11 @@ Status RocksDBOptionsParser::Parse(const ConfigOptions& config_options_in,
         return s;
       }
 
-      // If the option file is not generated by a higher minor version,
+      // If the option file is generated by a lower minor version,
       // there shouldn't be any unknown option.
       if (ignore_unknown_options && section == kOptionSectionVersion) {
-        if (db_version[0] < ROCKSDB_MAJOR || (db_version[0] == ROCKSDB_MAJOR &&
-                                              db_version[1] <= ROCKSDB_MINOR)) {
+        if (db_version[0] < ROCKSDB_MAJOR ||
+            (db_version[0] == ROCKSDB_MAJOR && db_version[1] < ROCKSDB_MINOR)) {
           ignore_unknown_options = false;
         }
       }

diff --git a/options/options_test.cc b/options/options_test.cc
@@ -1307,7 +1307,7 @@ TEST_F(OptionsParserTest, IgnoreUnknownOptions) {
     bool should_ignore = true;
     if (case_id == 0) {
       // same version
-      should_ignore = false;
+      should_ignore = true;
       version_string =
           ToString(ROCKSDB_MAJOR) + "." + ToString(ROCKSDB_MINOR) + ".0";
     } else if (case_id == 1) {