Skip to content

Commit 7c2c684

Browse files
2 bug fixes (#1792)
1. retention task should not call querier for rentention/cleanup, only ingestor cleanup required 2. if file not found in hottier, log in debug not error
1 parent ac5b40b commit 7c2c684

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

‎src/catalog/mod.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use crate::{
3131
event::DEFAULT_TIMESTAMP_KEY,
3232
handlers::{
3333
self,
34-
http::{base_path_without_preceding_slash, cluster::for_each_live_node},
34+
http::{base_path_without_preceding_slash, cluster::for_each_live_node, modal::NodeType},
3535
},
3636
metrics::{EVENTS_INGESTED_DATE, EVENTS_INGESTED_SIZE_DATE, EVENTS_STORAGE_SIZE_DATE},
3737
option::Mode,
@@ -538,6 +538,10 @@ pub async fn remove_manifest_from_snapshot(
538538
let stream_name = stream_name_clone.clone();
539539
let dates = dates_clone.clone();
540540
async move {
541+
if ingestor.node_type != NodeType::Ingestor {
542+
return Ok::<(), ObjectStorageError>(());
543+
}
544+
541545
let url = format!(
542546
"{}{}/logstream/{}/retention/cleanup",
543547
ingestor.domain_name,

‎src/hottier.rs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,13 @@ where
143143
);
144144
(file, false)
145145
}
146+
Err(error) if error.kind() == io::ErrorKind::NotFound => {
147+
tracing::debug!(
148+
path = ?hot_tier_path,
149+
"hot tier file not cached; using object storage"
150+
);
151+
(file, false)
152+
}
146153
Err(error) => {
147154
tracing::error!("hot tier file metadata check failed for {hot_tier_path:?} - {error}");
148155
(file, false)

0 commit comments

Comments
 (0)