diff --git a/HISTORY.md b/HISTORY.md index 49fc56df8768d9b28b25f9794a55809dbc12230e..245f4ec61db71b935e0acccae311de051ccf0697 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -9,6 +9,9 @@ numbered levels will be placed later in the db_paths vector. * Potentially big performance improvements if you're using RocksDB with lots of column families (100-1000) +### Public API changes +* Deprecated skip_log_error_on_recovery option + ### 3.9.0 (12/8/2014) ### New Features diff --git a/db/db_impl.cc b/db/db_impl.cc index e529db3c7affdad301db0f491bf7343ea7cfa830..dfe66eeab2d896cddb10f99136ed30d07c69327d 100644 --- a/db/db_impl.cc +++ b/db/db_impl.cc @@ -842,8 +842,7 @@ Status DBImpl::RecoverLogFiles(const std::vector& log_numbers, Env* env; Logger* info_log; const char* fname; - Status* status; // nullptr if db_options_.paranoid_checks==false or - // db_options_.skip_log_error_on_recovery==true + Status* status; // nullptr if db_options_.paranoid_checks==false virtual void Corruption(size_t bytes, const Status& s) { Log(InfoLogLevel::WARN_LEVEL, info_log, "%s%s: dropping %d bytes; %s", @@ -888,10 +887,7 @@ Status DBImpl::RecoverLogFiles(const std::vector& log_numbers, reporter.env = env_; reporter.info_log = db_options_.info_log.get(); reporter.fname = fname.c_str(); - reporter.status = - (db_options_.paranoid_checks && !db_options_.skip_log_error_on_recovery - ? &status - : nullptr); + reporter.status = (db_options_.paranoid_checks) ? &status : nullptr; // We intentially make log::Reader do checksumming even if // paranoid_checks==false so that corruptions cause entire commits // to be skipped instead of propagating bad information (like overly diff --git a/include/rocksdb/options.h b/include/rocksdb/options.h index 298ec6aee6985b658e2f6a8bcb1715ad3113caf9..75625abccc2b39161a337ea2b4f6cacadd4ad9da 100644 --- a/include/rocksdb/options.h +++ b/include/rocksdb/options.h @@ -850,9 +850,7 @@ struct DBOptions { // Disable child process inherit open files. Default: true bool is_fd_close_on_exec; - // Skip log corruption error on recovery (If client is ok with - // losing most recent changes) - // Default: false + // DEPRECATED -- this options is no longer used bool skip_log_error_on_recovery; // if not zero, dump rocksdb.stats to LOG every stats_dump_period_sec diff --git a/util/options.cc b/util/options.cc index 085df053d2dcd9fc1f748ded6aeef2ddd6b5fd1f..75307f13f234e16892e108ae9c426fbf6967d269 100644 --- a/util/options.cc +++ b/util/options.cc @@ -333,8 +333,6 @@ void DBOptions::Dump(Logger* log) const { allow_mmap_writes); Log(log, " Options.is_fd_close_on_exec: %d", is_fd_close_on_exec); - Log(log, " Options.skip_log_error_on_recovery: %d", - skip_log_error_on_recovery); Log(log, " Options.stats_dump_period_sec: %u", stats_dump_period_sec); Log(log, " Options.advise_random_on_open: %d",