Add debug info

Signed-off-by: Yang Zhang <[email protected]>

Author: v01dstar

include/titan/options.h

@@ -166,7 +166,7 @@ struct TitanCFOptions : public ColumnFamilyOptions {
   // support hole punching, such as ext4, xfs, btrfs, etc.
   //
   // Default: false
-  bool hole_punching_gc{false};
+  bool enable_punch_hole_gc{false};
 
   TitanCFOptions() = default;
   explicit TitanCFOptions(const ColumnFamilyOptions& options)
@@ -197,7 +197,8 @@ struct ImmutableTitanCFOptions {
         min_gc_batch_size(opts.min_gc_batch_size),
         merge_small_file_threshold(opts.merge_small_file_threshold),
         level_merge(opts.level_merge),
-        skip_value_in_compaction_filter(opts.skip_value_in_compaction_filter) {}
+        skip_value_in_compaction_filter(opts.skip_value_in_compaction_filter),
+        enable_punch_hole_gc(opts.enable_punch_hole_gc) {}
 
   uint64_t blob_file_target_size;
 
@@ -212,6 +213,8 @@ struct ImmutableTitanCFOptions {
   bool level_merge;
 
   bool skip_value_in_compaction_filter;
+
+  bool enable_punch_hole_gc;
 };
 
 struct MutableTitanCFOptions {
@@ -221,14 +224,12 @@ struct MutableTitanCFOptions {
       : blob_run_mode(opts.blob_run_mode),
         min_blob_size(opts.min_blob_size),
         blob_file_compression(opts.blob_file_compression),
-        blob_file_discardable_ratio(opts.blob_file_discardable_ratio),
-        hole_punching_gc(opts.hole_punching_gc) {}
+        blob_file_discardable_ratio(opts.blob_file_discardable_ratio) {}
 
   TitanBlobRunMode blob_run_mode;
   uint64_t min_blob_size;
   CompressionType blob_file_compression;
   double blob_file_discardable_ratio;
-  bool hole_punching_gc;
 };
 
 struct TitanOptions : public TitanDBOptions, public TitanCFOptions {

src/blob_file_builder.cc

@@ -36,7 +36,7 @@ BlobFileBuilder::BlobFileBuilder(const TitanDBOptions& db_options,
 #endif
   }
   // alignment_size_ = cf_options_.alignment_size;
-  alignment_size_ = cf_options.hole_punching_gc ? 4 * 1024 : 0;
+  alignment_size_ = cf_options.enable_punch_hole_gc ? 4 * 1024 : 0;
   WriteHeader();
 }
 

src/blob_format.cc

@@ -302,8 +302,11 @@ TitanInternalStats::StatsType BlobFileMeta::GetDiscardableRatioLevel() const {
 }
 
 void BlobFileMeta::Dump(bool with_keys) const {
-  fprintf(stdout, "file %" PRIu64 ", size %" PRIu64 ", level %" PRIu32,
-          file_number_, file_size_, file_level_);
+  fprintf(stdout,
+          "file %" PRIu64 ", size %" PRIu64 ", level %" PRIu32
+          "live blocks %" PRIu64 ", hole punchable blocks %" PRIu64,
+          file_number_, file_size_, file_level_, live_blocks_.load(),
+          hole_punchable_blocks_.load());
   if (with_keys) {
     fprintf(stdout, ", smallest key: %s, largest key: %s",
             Slice(smallest_key_).ToString(true /*hex*/).c_str(),

src/blob_gc_job_test.cc

@@ -298,7 +298,7 @@ TEST_F(BlobGCJobTest, PunchHole) {
   rocksdb::SyncPoint::GetInstance()->EnableProcessing();
 
   DisableMergeSmall();
-  options_.hole_punching_gc = true;
+  options_.enable_punch_hole_gc = true;
   options_.disable_background_gc = false;
   options_.disable_auto_compactions = false;
 
@@ -340,7 +340,7 @@ TEST_F(BlobGCJobTest, PunchHole) {
       ASSERT_EQ(value, values[i]);
     }
   }
-  options_.hole_punching_gc = false;
+  options_.enable_punch_hole_gc = false;
   options_.disable_background_gc = true;
   options_.disable_auto_compactions = true;
 }

src/blob_storage.cc

@@ -266,7 +266,7 @@ void BlobStorage::ComputeGCScore() {
       score = file.second->GetDiscardableRatio();
     }
     if (score < cf_options_.blob_file_discardable_ratio &&
-        cf_options_.hole_punching_gc) {
+        cf_options_.enable_punch_hole_gc) {
       auto punch_hole_score = file.second->GetPunchHoleScore();
       if (punch_hole_score > 0) {
         GCScore gc_score = {};

src/db_impl_gc.cc

@@ -339,6 +339,8 @@ Status TitanDBImpl::BackgroundGC(LogBuffer* log_buffer, BlobGC* blob_gc) {
     // Nothing to do
     TITAN_LOG_BUFFER(log_buffer, "Titan GC nothing to do");
   } else {
+    TITAN_LOG_BUFFER(log_buffer, "Titan GC start, using punch hole: %s",
+                     blob_gc->use_punch_hole());
     StopWatch gc_sw(env_->GetSystemClock().get(), statistics(stats_.get()),
                     TITAN_GC_MICROS);
     BlobGCJob blob_gc_job(blob_gc, db_, &mutex_, db_options_, env_,

src/edit_collector.h

@@ -309,6 +309,11 @@ class EditCollector {
                   file.second);
         }
       }
+      for (auto& file : updated_files_) {
+        if (deleted_files_.count(file.first) == 0) {
+          file.second->Dump(with_keys);
+        }
+      }
     }
 
    private:

src/options.cc

@@ -43,7 +43,8 @@ TitanCFOptions::TitanCFOptions(const ColumnFamilyOptions& cf_opts,
       merge_small_file_threshold(immutable_opts.merge_small_file_threshold),
       blob_run_mode(mutable_opts.blob_run_mode),
       skip_value_in_compaction_filter(
-          immutable_opts.skip_value_in_compaction_filter) {}
+          immutable_opts.skip_value_in_compaction_filter),
+      enable_punch_hole_gc(immutable_opts.enable_punch_hole_gc) {}
 
 void TitanCFOptions::Dump(Logger* logger) const {
   TITAN_LOG_HEADER(logger,
@@ -94,6 +95,8 @@ void TitanCFOptions::Dump(Logger* logger) const {
   }
   TITAN_LOG_HEADER(logger, "TitanCFOptions.blob_run_mode                : %s",
                    blob_run_mode_str.c_str());
+  TITAN_LOG_HEADER(logger, "TitanCFOptions.enable_punch_hole_gc         : %s",
+                   enable_punch_hole_gc ? "true" : "false");
 }
 
 void TitanCFOptions::UpdateMutableOptions(