logos-blockchain/logos-blockchain-testing
1
0
Fork 0
mirror of https://github.com/logos-blockchain/logos-blockchain-testing.git synced 2026-01-04 06:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(k8s-runner): name cleanup timeouts

Browse Source
This commit is contained in:
andrussal 2025-12-16 03:36:39 +01:00
parent b7e8821a23
commit 3b5e07bfb3
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
testing-framework/runners/k8s/src/lifecycle/cleanup.rs
View File

@ -11,6 +11,9 @@ use tracing::{info, warn};
use crate::infrastructure::helm::uninstall_release; use crate::infrastructure::helm::uninstall_release;
const CLEANUP_TIMEOUT: Duration = Duration::from_secs(120);
const NAMESPACE_DELETE_TIMEOUT: Duration = Duration::from_secs(10);
/// Tears down Helm release and namespace after a run unless preservation is /// Tears down Helm release and namespace after a run unless preservation is
/// set. /// set.
pub struct RunnerCleanup { pub struct RunnerCleanup {
@ -51,11 +54,15 @@ impl RunnerCleanup {
fn blocking_cleanup_success(&self) -> bool { fn blocking_cleanup_success(&self) -> bool {
match tokio::runtime::Runtime::new() { match tokio::runtime::Runtime::new() {
Ok(rt) => match rt.block_on(async { Ok(rt) => match rt.block_on(async {
tokio::time::timeout(Duration::from_secs(120), self.cleanup_async()).await tokio::time::timeout(CLEANUP_TIMEOUT, self.cleanup_async()).await
}) { }) {
Ok(()) => true, Ok(()) => true,
Err(err) => { Err(err) => {
warn!(error = ?err, "cleanup timed out after 120s; falling back to background thread"); warn!(
error = ?err,
"cleanup timed out after {}s; falling back to background thread",
CLEANUP_TIMEOUT.as_secs()
);
false false
} }
}, },
@ -95,7 +102,7 @@ fn run_background_cleanup(cleanup: Box<RunnerCleanup>) {
match tokio::runtime::Runtime::new() { match tokio::runtime::Runtime::new() {
Ok(rt) => { Ok(rt) => {
if let Err(err) = rt.block_on(async { if let Err(err) = rt.block_on(async {
tokio::time::timeout(Duration::from_secs(120), cleanup.cleanup_async()).await tokio::time::timeout(CLEANUP_TIMEOUT, cleanup.cleanup_async()).await
}) { }) {
warn!("[k8s-runner] background cleanup timed out: {err}"); warn!("[k8s-runner] background cleanup timed out: {err}");
} }
@ -125,7 +132,7 @@ async fn delete_namespace(client: &Client, namespace: &str) {
async fn delete_namespace_via_api(namespaces: &Api<Namespace>, namespace: &str) -> bool { async fn delete_namespace_via_api(namespaces: &Api<Namespace>, namespace: &str) -> bool {
info!(namespace, "invoking kubernetes API to delete namespace"); info!(namespace, "invoking kubernetes API to delete namespace");
match tokio::time::timeout( match tokio::time::timeout(
Duration::from_secs(10), NAMESPACE_DELETE_TIMEOUT,
namespaces.delete(namespace, &DeleteParams::default()), namespaces.delete(namespace, &DeleteParams::default()),
) )
.await .await