Skip to content

fix: parallelize runner config endpoints #3253

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

fix: parallelize runner config endpoints #3253

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
4 changes: 2 additions & 2 deletions engine/packages/api-peer/src/runner_configs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,14 @@ pub async fn upsert(
})
}

#[derive(Debug, Serialize, Deserialize, IntoParams)]
#[derive(Debug, Serialize, Clone, Deserialize, IntoParams)]
#[serde(deny_unknown_fields)]
#[into_params(parameter_in = Query)]
pub struct DeleteQuery {
pub namespace: String,
}

#[derive(Deserialize)]
#[derive(Deserialize, Clone)]
#[serde(deny_unknown_fields)]
pub struct DeletePath {
pub runner_name: String,
Expand Down
64 changes: 39 additions & 25 deletions engine/packages/api-public/src/runner_configs/delete.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use anyhow::Result;
use anyhow::{Context, Result};
use axum::response::{IntoResponse, Response};
use futures_util::{StreamExt, TryStreamExt};
use rivet_api_builder::{
ApiError,
extract::{Extension, Json, Path, Query},
Expand Down Expand Up @@ -38,30 +39,43 @@ pub async fn delete(
async fn delete_inner(ctx: ApiCtx, path: DeletePath, query: DeleteQuery) -> Result<DeleteResponse> {
ctx.auth().await?;

for dc in &ctx.config().topology().datacenters {
if ctx.config().dc_label() == dc.datacenter_label {
rivet_api_peer::runner_configs::delete(
ctx.clone().into(),
DeletePath {
runner_name: path.runner_name.clone(),
},
DeleteQuery {
namespace: query.namespace.clone(),
},
)
.await?;
} else {
request_remote_datacenter::<DeleteResponse>(
ctx.config(),
dc.datacenter_label,
&format!("/runner-configs/{}", path.runner_name),
axum::http::Method::DELETE,
Some(&query),
Option::<&()>::None,
)
.await?;
}
}
let dcs = ctx.config().topology().datacenters.clone();
futures_util::stream::iter(dcs)
.map(|dc| {
let ctx = ctx.clone();
let query = query.clone();
let path = path.clone();
async move {
if ctx.config().dc_label() == dc.datacenter_label {
rivet_api_peer::runner_configs::delete(
ctx.clone().into(),
DeletePath {
runner_name: path.runner_name.clone(),
},
DeleteQuery {
namespace: query.namespace.clone(),
},
)
.await?;
} else {
request_remote_datacenter::<DeleteResponse>(
ctx.config(),
dc.datacenter_label,
&format!("/runner-configs/{}", path.runner_name),
axum::http::Method::DELETE,
Some(&query),
Option::<&()>::None,
)
.await?;
}

anyhow::Ok(())
}
})
.buffer_unordered(16)
.try_collect::<Vec<_>>()
// NOTE: We must error when any peer request fails, not all
.await?;

// Resolve namespace
let namespace = ctx
Expand Down
118 changes: 68 additions & 50 deletions engine/packages/api-public/src/runner_configs/upsert.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use std::collections::HashMap;

use anyhow::Result;
use axum::response::{IntoResponse, Response};
use futures_util::{StreamExt, TryStreamExt};
use rivet_api_builder::{
ApiError,
extract::{Extension, Json, Path, Query},
Expand Down Expand Up @@ -85,58 +86,75 @@ async fn upsert_inner(
})
.next();

// Apply config
let mut any_endpoint_config_changed = false;
for dc in &ctx.config().topology().datacenters {
if let Some(runner_config) = body.datacenters.remove(&dc.name) {
let response = if ctx.config().dc_label() == dc.datacenter_label {
rivet_api_peer::runner_configs::upsert(
ctx.clone().into(),
path.clone(),
query.clone(),
rivet_api_peer::runner_configs::UpsertRequest(runner_config),
)
.await?
} else {
request_remote_datacenter::<UpsertResponse>(
ctx.config(),
dc.datacenter_label,
&format!("/runner-configs/{}", path.runner_name),
axum::http::Method::PUT,
Some(&query),
Some(&runner_config),
)
.await?
};
let dcs = ctx
.config()
.topology()
.datacenters
.iter()
.map(|dc| (dc.clone(), body.datacenters.remove(&dc.name)))
.collect::<Vec<_>>();
let any_endpoint_config_changed = futures_util::stream::iter(dcs)
.map(|(dc, runner_config)| {
let ctx = ctx.clone();
let query = query.clone();
let path = path.clone();
async move {
if let Some(runner_config) = runner_config {
let response = if ctx.config().dc_label() == dc.datacenter_label {
rivet_api_peer::runner_configs::upsert(
ctx.clone().into(),
path.clone(),
query.clone(),
rivet_api_peer::runner_configs::UpsertRequest(runner_config),
)
.await?
} else {
request_remote_datacenter::<UpsertResponse>(
ctx.config(),
dc.datacenter_label,
&format!("/runner-configs/{}", path.runner_name),
axum::http::Method::PUT,
Some(&query),
Some(&runner_config),
)
.await?
};

if response.endpoint_config_changed {
any_endpoint_config_changed = true;
}
} else {
if ctx.config().dc_label() == dc.datacenter_label {
rivet_api_peer::runner_configs::delete(
ctx.clone().into(),
DeletePath {
runner_name: path.runner_name.clone(),
},
DeleteQuery {
namespace: query.namespace.clone(),
},
)
.await?;
} else {
request_remote_datacenter::<DeleteResponse>(
ctx.config(),
dc.datacenter_label,
&format!("/runner-configs/{}", path.runner_name),
axum::http::Method::DELETE,
Some(&query),
Option::<&()>::None,
)
.await?;
anyhow::Ok(response.endpoint_config_changed)
} else {
if ctx.config().dc_label() == dc.datacenter_label {
rivet_api_peer::runner_configs::delete(
ctx.clone().into(),
DeletePath {
runner_name: path.runner_name.clone(),
},
DeleteQuery {
namespace: query.namespace.clone(),
},
)
.await?;
} else {
request_remote_datacenter::<DeleteResponse>(
ctx.config(),
dc.datacenter_label,
&format!("/runner-configs/{}", path.runner_name),
axum::http::Method::DELETE,
Some(&query),
Option::<&()>::None,
)
.await?;
}

Ok(false)
}
}
}
}
})
.buffer_unordered(16)
.try_collect::<Vec<_>>()
// NOTE: We must error when any peer request fails, not all
.await?
.into_iter()
.any(|endpoint_config_changed| endpoint_config_changed);

// Update runner metadata
//
Expand Down
1 change: 1 addition & 0 deletions engine/packages/api-public/src/runner_configs/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ pub async fn fetch_serverless_runner_metadata(
.headers(header_map)
.timeout(Duration::from_secs(10))
.send()
.custom_instrument(tracing::info_span!("fetch_metadata_request"))
.await
.map_err(|err| {
if err.is_timeout() {
Expand Down
61 changes: 31 additions & 30 deletions engine/packages/api-util/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,38 +109,39 @@ where
A: Fn(u16, I, &mut R),
R: Default + Send + 'static,
{
let dcs = &ctx.config().topology().datacenters;

let results = futures_util::stream::iter(dcs.clone().into_iter().map(|dc| {
let ctx = ctx.clone();
let query = query.clone();
let endpoint = endpoint.to_string();
let local_handler = local_handler.clone();

async move {
if dc.datacenter_label == ctx.config().dc_label() {
// Local datacenter - use direct API call
(dc.datacenter_label, local_handler(ctx, query).await)
} else {
// Remote datacenter - HTTP request
(
dc.datacenter_label,
request_remote_datacenter::<I>(
ctx.config(),
let dcs = ctx.config().topology().datacenters.clone();

let results = futures_util::stream::iter(dcs)
.map(|dc| {
let ctx = ctx.clone();
let query = query.clone();
let endpoint = endpoint.to_string();
let local_handler = local_handler.clone();

async move {
if dc.datacenter_label == ctx.config().dc_label() {
// Local datacenter - use direct API call
(dc.datacenter_label, local_handler(ctx, query).await)
} else {
// Remote datacenter - HTTP request
(
dc.datacenter_label,
&endpoint,
Method::GET,
Some(&query),
Option::<&()>::None,
request_remote_datacenter::<I>(
ctx.config(),
dc.datacenter_label,
&endpoint,
Method::GET,
Some(&query),
Option::<&()>::None,
)
.await,
)
.await,
)
}
}
}
}))
.buffer_unordered(16)
.collect::<Vec<_>>()
.await;
})
.buffer_unordered(16)
.collect::<Vec<_>>()
.await;

// Aggregate results
let result_count = results.len();
Expand All @@ -159,7 +160,7 @@ where
// Error only if all requests failed
if result_count == errors.len() {
if let Some(res) = errors.into_iter().next() {
return Err(res).with_context(|| "all datacenter requests failed");
return Err(res).context("all datacenter requests failed");
}
}

Expand Down
1 change: 1 addition & 0 deletions engine/packages/namespace/src/ops/resolve_for_name_global.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ pub async fn namespace_resolve_for_name_global(
.get(url)
.query(&[("name", &input.name)])
.send()
.custom_instrument(tracing::info_span!("namespaces_http_request"))
.await?;

let res = rivet_api_util::parse_response::<
Expand Down
Loading