Skip to content

Fix range tombstone GC with ingest-behind resurrecting deleted keys #15653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Potato-Yao wants to merge 2 commits into
base: main
Choose a base branch
from
+49 −0
Open

Fix range tombstone GC with ingest-behind resurrecting deleted keys #15653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
170134f
Add reproducer for ingest-behind range deletion loss
Potato-Yao Nov 11, 2026
64d5d08
Fixed compaction discarding range tombstones with ingest-behind enabl…
Potato-Yao Nov 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions db/compaction/compaction_outputs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,8 @@ Status CompactionOutputs::AddRangeDels(
// range_del_agg_, and range_del_agg_ internally drops tombstones above
// trim_ts_.
bool consider_drop =
!compaction_->immutable_options().cf_allow_ingest_behind &&
!compaction_->immutable_options().allow_ingest_behind &&
tombstone.seq_ <= earliest_snapshot &&
(ts_sz == 0 ||
(!full_history_ts_low.empty() &&
Expand Down
47 changes: 47 additions & 0 deletions db/external_sst_file_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3801,6 +3801,53 @@ TEST_F(ExternalSSTFileTest, SnapshotInconsistencyBug) {
db_->ReleaseSnapshot(snap);
}

TEST_P(ExternalSSTFileTest, IngestBehindPreservesRangeDeletions) {
for (bool cf_option : {true, false}) {
SCOPED_TRACE("cf_option = " + std::to_string(cf_option));
for (bool compact_before_ingest : {false, true}) {
SCOPED_TRACE("compact_before_ingest = " +
std::to_string(compact_before_ingest));
Options options = CurrentOptions();
options.compaction_style = kCompactionStyleUniversal;
options.num_levels = 4;
options.disable_auto_compactions = true;
options.cf_allow_ingest_behind = cf_option;
options.allow_ingest_behind = !cf_option;
DestroyAndReopen(options);

ASSERT_OK(Put("a", "new"));
ASSERT_OK(Delete("b"));
ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
"c", "d"));
ASSERT_OK(Flush());
if (compact_before_ingest) {
CompactRangeOptions compact_options;
compact_options.bottommost_level_compaction =
BottommostLevelCompaction::kForce;
ASSERT_OK(db_->CompactRange(compact_options, nullptr, nullptr));
}

ASSERT_EQ("new", Get("a"));
ASSERT_EQ("NOT_FOUND", Get("b"));
ASSERT_EQ("NOT_FOUND", Get("c"));
ASSERT_EQ("NOT_FOUND", Get("c2"));

const std::vector<std::pair<std::string, std::string>> historical_data = {
{"a", "old"}, {"b", "old"}, {"c", "old"},
{"c2", "old"}, {"d", "old"}, {"e", "old"}};
ASSERT_OK(GenerateAndAddExternalFile(options, historical_data, -1, true,
std::get<0>(GetParam()), true));

EXPECT_EQ("new", Get("a"));
EXPECT_EQ("NOT_FOUND", Get("b"));
EXPECT_EQ("NOT_FOUND", Get("c"));
EXPECT_EQ("NOT_FOUND", Get("c2"));
EXPECT_EQ("old", Get("d"));
EXPECT_EQ("old", Get("e"));
}
}
}

TEST_P(ExternalSSTFileTest, IngestBehind) {
for (bool cf_option : {false, true}) {
SCOPED_TRACE("cf_option = " + std::to_string(cf_option));
Expand Down