From 79b6ab43ce495cb6cd922fff80462597916dcda6 Mon Sep 17 00:00:00 2001 From: Levi Tamasi Date: Thu, 7 Mar 2019 10:15:24 -0800 Subject: [PATCH] BlobDB: Remove GC interval option (#5044) Summary: Remove BlobDBOptions.garbage_collection_interval_secs for now, since garbage collection is not yet implemented in BlobDB. Pull Request resolved: https://github.com/facebook/rocksdb/pull/5044 Differential Revision: D14354046 Pulled By: ltamasi fbshipit-source-id: 2b966b6d1e088ba9462f3ea73e115013562fbc04 --- utilities/blob_db/blob_db.cc | 3 --- utilities/blob_db/blob_db.h | 3 --- utilities/blob_db/blob_db_impl.cc | 3 --- 3 files changed, 9 deletions(-) diff --git a/utilities/blob_db/blob_db.cc b/utilities/blob_db/blob_db.cc index 11c59a6b1..d660def49 100644 --- a/utilities/blob_db/blob_db.cc +++ b/utilities/blob_db/blob_db.cc @@ -93,9 +93,6 @@ void BlobDBOptions::Dump(Logger* log) const { ROCKS_LOG_HEADER( log, " BlobDBOptions.enable_garbage_collection: %d", enable_garbage_collection); - ROCKS_LOG_HEADER( - log, " BlobDBOptions.garbage_collection_interval_secs: %" PRIu64, - garbage_collection_interval_secs); ROCKS_LOG_HEADER( log, " BlobDBOptions.disable_background_tasks: %d", disable_background_tasks); diff --git a/utilities/blob_db/blob_db.h b/utilities/blob_db/blob_db.h index d07703185..3beb74fc9 100644 --- a/utilities/blob_db/blob_db.h +++ b/utilities/blob_db/blob_db.h @@ -73,9 +73,6 @@ struct BlobDBOptions { // blob files will be cleanup based on TTL. bool enable_garbage_collection = false; - // Time interval to trigger garbage collection, in seconds. - uint64_t garbage_collection_interval_secs = 60; - // Disable all background job. Used for test only. bool disable_background_tasks = false; diff --git a/utilities/blob_db/blob_db_impl.cc b/utilities/blob_db/blob_db_impl.cc index 880e222ba..109ea06ce 100644 --- a/utilities/blob_db/blob_db_impl.cc +++ b/utilities/blob_db/blob_db_impl.cc @@ -198,9 +198,6 @@ void BlobDBImpl::StartBackgroundTasks() { tqueue_.add( kReclaimOpenFilesPeriodMillisecs, std::bind(&BlobDBImpl::ReclaimOpenFiles, this, std::placeholders::_1)); - tqueue_.add(static_cast( - bdb_options_.garbage_collection_interval_secs * 1000), - std::bind(&BlobDBImpl::RunGC, this, std::placeholders::_1)); tqueue_.add( kDeleteObsoleteFilesPeriodMillisecs, std::bind(&BlobDBImpl::DeleteObsoleteFiles, this, std::placeholders::_1));