fix: properly clear tiered stashes upon expirations

Fixes #4387 Signed-off-by: Roman Gershman <[email protected]>
dragonflydb · Jan 2, 2025 · 59a8e1d · 59a8e1d
1 parent 7a68528
commit 59a8e1d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/src/server/db_slice.cc b/src/server/db_slice.cc
@@ -1474,9 +1474,13 @@ void DbSlice::PerformDeletion(Iterator del_it, ExpIterator exp_it, DbTable* tabl
   }
 
   DbTableStats& stats = table->stats;
-  const PrimeValue& pv = del_it->second;
+  PrimeValue& pv = del_it->second;
 
-  if (pv.IsExternal() && shard_owner()->tiered_storage()) {
+  if (pv.HasStashPending()) {
+    string scratch;
+    string_view key = del_it->first.GetSlice(&scratch);
+    shard_owner()->tiered_storage()->CancelStash(table->index, key, &pv);
+  } else if (pv.IsExternal()) {
     shard_owner()->tiered_storage()->Delete(table->index, &del_it->second);
   }
 

diff --git a/src/server/tiered_storage.cc b/src/server/tiered_storage.cc
@@ -391,7 +391,7 @@ bool TieredStorage::TryStash(DbIndex dbid, string_view key, PrimeValue* value) {
     return false;
 
   // This invariant should always hold because ShouldStash tests for IoPending flag.
-  DCHECK(!bins_->IsPending(dbid, key));
+  CHECK(!bins_->IsPending(dbid, key));
 
   // TODO: When we are low on memory we should introduce a back-pressure, to avoid OOMs
   // with a lot of underutilized disk space.

diff --git a/src/server/tiered_storage_test.cc b/src/server/tiered_storage_test.cc
@@ -317,4 +317,13 @@ TEST_F(TieredStorageTest, MemoryPressure) {
   EXPECT_LT(used_mem_peak.load(), 20_MB);
 }
 
+TEST_F(TieredStorageTest, Expiry) {
+  string val = BuildString(100);
+  Run({"psetex", "key1", "1", val});
+  AdvanceTime(10);
+  Run({"psetex", "key1", "1", val});
+  auto resp = Run({"get", "key1"});
+  EXPECT_EQ(resp, val);
+}
+
 }  // namespace dfly