Skip to content

fix: make retention path tenant aware #1838

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

fix: make retention path tenant aware #1838

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
12 changes: 10 additions & 2 deletions src/storage/retention.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,9 @@ impl From<Retention> for Vec<TaskView> {
}

mod action {
use crate::catalog::remove_manifest_from_snapshot;
use crate::parseable::PARSEABLE;
use crate::tenants::TENANT_METADATA;
use crate::{catalog::remove_manifest_from_snapshot, parseable::DEFAULT_TENANT};
use chrono::{Days, NaiveDate, Utc};
use futures::{StreamExt, stream::FuturesUnordered};
use itertools::Itertools;
Expand Down Expand Up @@ -251,7 +251,15 @@ mod action {
}

for date in dates_to_delete {
let path = RelativePathBuf::from_iter([&stream_name, &date]);
// path should be tenant aware
let tenant = if let Some(tenant) = tenant_id
&& tenant != DEFAULT_TENANT
{
tenant
} else {
""
};
let path = RelativePathBuf::from_iter([tenant, &stream_name, &date]);
delete_tasks.push(async move {
PARSEABLE
.storage
Expand Down
Loading