diff --git a/tddb/td/db/RocksDb.cpp b/tddb/td/db/RocksDb.cpp index 0be79cb3..f1aa64a5 100644 --- a/tddb/td/db/RocksDb.cpp +++ b/tddb/td/db/RocksDb.cpp @@ -85,6 +85,8 @@ Result RocksDb::open(std::string path, RocksDbOptions options) { db_options.bytes_per_sync = 1 << 20; db_options.writable_file_max_buffer_size = 2 << 14; db_options.statistics = options.statistics; + db_options.max_log_file_size = 100 << 20; + db_options.keep_log_file_num = 1; rocksdb::OptimisticTransactionDBOptions occ_options; occ_options.validate_policy = rocksdb::OccValidationPolicy::kValidateSerial; rocksdb::ColumnFamilyOptions cf_options(db_options); diff --git a/validator/db/archive-slice.cpp b/validator/db/archive-slice.cpp index d392431a..83fe144b 100644 --- a/validator/db/archive-slice.cpp +++ b/validator/db/archive-slice.cpp @@ -768,22 +768,19 @@ void destroy_db(std::string name, td::uint32 attempt, td::Promise prom promise.set_value(td::Unit()); return; } - if (S.is_error() && attempt > 0 && attempt % 64 == 0) { + if (attempt > 0 && attempt % 64 == 0) { LOG(ERROR) << "failed to destroy index " << name << ": " << S; } else { LOG(DEBUG) << "failed to destroy index " << name << ": " << S; } delay_action( - [name, attempt, promise = std::move(promise)]() mutable { destroy_db(name, attempt, std::move(promise)); }, + [name, attempt, promise = std::move(promise)]() mutable { destroy_db(name, attempt + 1, std::move(promise)); }, td::Timestamp::in(1.0)); } } // namespace void ArchiveSlice::destroy(td::Promise promise) { before_query(); - td::MultiPromise mp; - auto ig = mp.init_guard(); - ig.add_promise(std::move(promise)); destroyed_ = true; for (auto &p : packages_) { @@ -795,10 +792,8 @@ void ArchiveSlice::destroy(td::Promise promise) { packages_.clear(); kv_ = nullptr; - PackageId p_id{archive_id_, key_blocks_only_, temp_}; - std::string db_path = PSTRING() << db_root_ << p_id.path() << p_id.name() << ".index"; - delay_action([name = db_path, attempt = 0, - promise = ig.get_promise()]() mutable { destroy_db(name, attempt, std::move(promise)); }, + delay_action([name = db_path_, attempt = 0, + promise = std::move(promise)]() mutable { destroy_db(name, attempt, std::move(promise)); }, td::Timestamp::in(0.0)); }