Skip to content

fix(pegboard): cache none runner pool errors too #3899

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
MasterPtato wants to merge 1 commit into from
Closed

fix(pegboard): cache none runner pool errors too #3899

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
37 changes: 27 additions & 10 deletions engine/packages/pegboard/src/ops/runner_config/get_error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ pub struct Input {
pub runners: Vec<(Id, String)>,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
struct RunnerPoolErrorCacheEntry {
namespace_id: Id,
runner_name: String,
error: Option<RunnerPoolError>,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct RunnerPoolErrorEntry {
pub namespace_id: Id,
Expand All @@ -25,7 +32,8 @@ pub async fn pegboard_runner_config_get_error(
return Ok(Vec::new());
}

ctx.cache()
let entries = ctx
.cache()
.clone()
.request()
// Short TTL since errors can change quickly
Expand All @@ -43,13 +51,24 @@ pub async fn pegboard_runner_config_get_error(
Ok(cache)
},
)
.await
.await?
.into_iter()
.filter_map(|entry| {
entry.error.map(|error| RunnerPoolErrorEntry {
namespace_id: entry.namespace_id,
runner_name: entry.runner_name,
error,
})
})
.collect();

Ok(entries)
}

async fn runner_config_get_error_inner(
ctx: &OperationCtx,
runners: Vec<(Id, String)>,
) -> Result<Vec<RunnerPoolErrorEntry>> {
) -> Result<Vec<RunnerPoolErrorCacheEntry>> {
let queries: Vec<(&str, serde_json::Value)> = runners
.iter()
.map(|(namespace_id, runner_name)| {
Expand Down Expand Up @@ -108,13 +127,11 @@ async fn runner_config_get_error_inner(
}
};

if let Some(active_error) = &state.active_error {
result.push(RunnerPoolErrorEntry {
namespace_id: *namespace_id,
runner_name: runner_name.clone(),
error: active_error.error.clone(),
});
}
result.push(RunnerPoolErrorCacheEntry {
namespace_id: *namespace_id,
runner_name: runner_name.clone(),
error: state.active_error.as_ref().map(|err| err.error.clone()),
});
}

Ok(result)
Expand Down
Loading