Skip to content

fix: don't disable TTL cleanup when a scan error interrupts CleanExpiredKeys #485

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
thweetkomputer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: don't disable TTL cleanup when a scan error interrupts CleanExpiredKeys #485

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion src/tasks/batch_write_task.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2027,6 +2027,7 @@ KvError BatchWriteTask::CleanExpiredKeys()
const uint64_t now_ts_ms = utils::UnixTs<chrono::milliseconds>();
const uint64_t now_ts_us = utils::UnixTs<chrono::microseconds>();
uint64_t next_expire_ts = 0;
KvError scan_err = KvError::NoError;
do
{
std::string_view ttl_key = iter.Key();
Expand All @@ -2040,7 +2041,18 @@ KvError BatchWriteTask::CleanExpiredKeys()
std::string key(ttl_key.substr(8));
data_batch.emplace_back(
std::move(key), "", now_ts_us, WriteOp::Delete, expire_ts);
} while (iter.Next() == KvError::NoError);
scan_err = iter.Next();
} while (scan_err == KvError::NoError);

// Real IO error (not EndOfFile): only a prefix of the expired keys was
// scanned. Aborting leaves next_expire_ts_ armed so the next TriggerTTL
// retries; committing would set it to 0 below and silently disable TTL.
if (scan_err != KvError::NoError && scan_err != KvError::EndOfFile)
{
LOG(ERROR) << "clean expired keys interrupted by scan error: "
<< ErrorString(scan_err);
return scan_err;
}

if (ttl_batch.empty())
{
Expand Down
Loading