Get options file nubmer while mutex lock

jaykorean · Feb 12, 2025 · e6b5df7 · e6b5df7
1 parent d48af21
commit e6b5df7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/db/compaction/compaction_job.cc b/db/compaction/compaction_job.cc
@@ -391,6 +391,8 @@ void CompactionJob::Prepare(
   // seqno threshold.)
   penultimate_after_seqno_ = std::max(preclude_last_level_min_seqno,
                                       c->GetKeepInLastLevelThroughSeqno());
+
+  options_file_number_ = versions_->options_file_number();
 }
 
 uint64_t CompactionJob::GetSubcompactionsLimit() {

diff --git a/db/compaction/compaction_job.h b/db/compaction/compaction_job.h
@@ -366,6 +366,10 @@ class CompactionJob {
   // the last level (output to penultimate level).
   SequenceNumber penultimate_after_seqno_ = kMaxSequenceNumber;
 
+  // Options File Number used for Remote Compaction
+  // Setting this requires DBMutex.
+  uint64_t options_file_number_ = 0;
+
   // Get table file name in where it's outputting to, which should also be in
   // `output_directory_`.
   virtual std::string GetTableFileName(uint64_t file_number);

diff --git a/db/compaction/compaction_service_job.cc b/db/compaction/compaction_service_job.cc
@@ -48,10 +48,7 @@ CompactionJob::ProcessKeyValueCompactionWithCompactionService(
   compaction_input.has_end = sub_compact->end.has_value();
   compaction_input.end =
       compaction_input.has_end ? sub_compact->end->ToString() : "";
-  compaction_input.options_file_number =
-      sub_compact->compaction->input_version()
-          ->version_set()
-          ->options_file_number();
+  compaction_input.options_file_number = options_file_number_;
 
   TEST_SYNC_POINT_CALLBACK(
       "CompactionServiceJob::ProcessKeyValueCompactionWithCompactionService",