Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ members = [
vergen-gitcl = "1.0.0"
reqwest-eventsource = "0.6.0"

[workspace.dependencies.tokio-tungstenite]
version = "0.26.0"
features = [ "rustls-tls-native-roots" ]

[workspace.dependencies.vergen]
version = "9.0.4"
features = [ "build", "cargo", "rustc" ]
Expand Down Expand Up @@ -176,10 +180,6 @@ members = [
[workspace.dependencies.pest]
version = "2.7"

[workspace.dependencies.tokio-tungstenite]
version = "0.26.0"
features = ["rustls-tls-native-roots"]

[workspace.dependencies.rocksdb]
version = "0.24"
features = [ "multi-threaded-cf" ]
Expand Down
2 changes: 1 addition & 1 deletion engine/artifacts/config-schema.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions engine/artifacts/errors/ws.timed_out.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions engine/packages/api-types/src/namespaces/runner_configs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ pub enum RunnerConfigKind {
/// Seconds.
request_lifespan: u32,
max_concurrent_actors: Option<u64>,
/// Seconds.
drain_grace_period: Option<u32>,
slots_per_runner: u32,
min_runners: Option<u32>,
max_runners: u32,
Expand Down Expand Up @@ -50,6 +52,7 @@ impl Into<rivet_types::runner_configs::RunnerConfig> for RunnerConfig {
headers,
request_lifespan,
max_concurrent_actors,
drain_grace_period,
slots_per_runner,
min_runners,
max_runners,
Expand All @@ -60,6 +63,8 @@ impl Into<rivet_types::runner_configs::RunnerConfig> for RunnerConfig {
headers: headers.unwrap_or_default(),
request_lifespan,
max_concurrent_actors: max_concurrent_actors.unwrap_or(max_runners as u64),
// Default to deprecated config value (config.pegboard.serverless_drain_grace_period)
drain_grace_period: drain_grace_period.unwrap_or(10_000),
slots_per_runner,
min_runners: min_runners.unwrap_or_default(),
max_runners,
Expand Down
2 changes: 2 additions & 0 deletions engine/packages/config/src/config/pegboard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ pub struct Pegboard {
pub envoy_eligible_threshold: Option<i64>,

// === Serverless Settings ===
/// **Deprecated** Configure the drain period in the runner config.
///
/// Drain grace period for serverless runners.
///
/// This time is subtracted from the configured request duration. Once `duration - grace` is reached, the
Expand Down
Loading
Loading