Skip to content

feat: add configurable minimum age for lost servers #2297

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

Closed
wants to merge 1 commit into from
Closed

feat: add configurable minimum age for lost servers #2297

Show file tree
Hide file tree
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: 8 additions & 4 deletions packages/core/services/cluster/src/ops/server/lost_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ struct Linode {
#[derive(Debug)]
pub struct Input {
pub filter: Filter,
/// Minimum age of servers to consider lost (in minutes, default: 720 [12 hours])
pub min_age: Option<u64>,
}

#[derive(Debug)]
Expand All @@ -30,7 +32,7 @@ pub struct Output {
}

/// Fetches deleted servers directly from the cloud providers own APIs and returns existing servers older
/// than 12 hours.
/// than the specified minimum age (defaults to 720 minutes [12 hours]).
#[operation]
#[timeout = 300]
pub async fn cluster_server_lost_list(ctx: &OperationCtx, input: &Input) -> GlobalResult<Output> {
Expand Down Expand Up @@ -78,7 +80,7 @@ pub async fn cluster_server_lost_list(ctx: &OperationCtx, input: &Input) -> Glob
}
Provider::Linode => {
servers.extend(
run_for_linode_account(ctx, &input.filter, &api_token, &headers).await?,
run_for_linode_account(ctx, &input.filter, &api_token, &headers, input.min_age).await?,
);
}
}
Expand All @@ -92,6 +94,7 @@ async fn run_for_linode_account(
filter: &Filter,
api_token: &str,
headers: &header::HeaderMap,
min_age: Option<u64>,
) -> GlobalResult<Vec<Server>> {
// Build HTTP client
let client = client::Client::new_with_headers(api_token.to_string(), headers.clone()).await?;
Expand All @@ -110,12 +113,13 @@ async fn run_for_linode_account(
tracing::info!("{} servers in account", res.data.len());

let server_config = ctx.config().server()?;
let min_age_minutes = min_age.unwrap_or(720) as i64; // Default 720 minutes (12 hours)
let server_ids = res
.data
.into_iter()
// Filter out servers younger than 12 hours
// Filter out servers younger than min_age
.filter(|linode| {
linode.created.and_utc().timestamp_millis() < ctx.ts() - util::duration::hours(12)
linode.created.and_utc().timestamp_millis() < ctx.ts() - util::duration::minutes(min_age_minutes)
})
// Parse server ID from linode label
.filter_map(|linode| {
Expand Down
3 changes: 3 additions & 0 deletions packages/core/services/cluster/src/ops/server/prune_with_filter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ use crate::{
#[derive(Debug)]
pub struct Input {
pub filter: Filter,
/// Minimum age of servers to consider lost (in minutes, default: 720 [12 hours])
pub min_age: Option<u64>,
}

#[derive(Debug)]
Expand All @@ -27,6 +29,7 @@ pub async fn cluster_server_prune_with_filter(
let servers_res = ctx
.op(crate::ops::server::lost_list::Input {
filter: input.filter.clone(),
min_age: input.min_age,
})
.await?;

Expand Down
Loading