Skip to content

feat(pegboard): add draining state to alloc metrics #2565

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(pegboard): add draining state to alloc metrics #2565

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
8 changes: 4 additions & 4 deletions packages/edge/services/pegboard/src/metrics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,28 @@ lazy_static::lazy_static! {
pub static ref CLIENT_MEMORY_TOTAL: IntGaugeVec = register_int_gauge_vec_with_registry!(
"pegboard_client_memory_total",
"Total MiB of memory available on a client.",
&["client_id", "flavor"],
&["client_id", "flavor", "state"],
*REGISTRY
).unwrap();

pub static ref CLIENT_CPU_TOTAL: IntGaugeVec = register_int_gauge_vec_with_registry!(
"pegboard_client_cpu_total",
"Total millicores of cpu available on a client.",
&["client_id", "flavor"],
&["client_id", "flavor", "state"],
*REGISTRY
).unwrap();

pub static ref CLIENT_MEMORY_ALLOCATED: IntGaugeVec = register_int_gauge_vec_with_registry!(
"pegboard_client_memory_allocated",
"Total MiB of memory allocated on a client.",
&["client_id", "flavor"],
&["client_id", "flavor", "state"],
*REGISTRY
).unwrap();

pub static ref CLIENT_CPU_ALLOCATED: IntGaugeVec = register_int_gauge_vec_with_registry!(
"pegboard_client_cpu_allocated",
"Total millicores of cpu allocated on a client.",
&["client_id", "flavor"],
&["client_id", "flavor", "state"],
*REGISTRY
).unwrap();

Expand Down
3 changes: 2 additions & 1 deletion packages/edge/services/pegboard/src/workflows/actor/analytics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,8 @@ pub async fn insert_clickhouse(
selected_memory_mib: state_row.selected_resources_memory_mib.unwrap_or_default() as u32,
root_user_enabled: state_row.root_user_enabled,
env_vars: state_row.environment.len() as i64,
env_var_bytes: state_row.environment
env_var_bytes: state_row
.environment
.iter()
.map(|(k, v)| k.len() + v.len())
.sum::<usize>() as i64,
Expand Down
138 changes: 119 additions & 19 deletions packages/edge/services/pegboard/src/workflows/client/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ pub async fn pegboard_client(ctx: &mut WorkflowCtx, input: &Input) -> GlobalResu
activity(UpdateMetricsInput {
client_id,
flavor,
draining: state.drain_timeout_ts.is_some(),
clear: false,
}),
))
Expand All @@ -125,6 +126,7 @@ pub async fn pegboard_client(ctx: &mut WorkflowCtx, input: &Input) -> GlobalResu
activity(UpdateMetricsInput {
client_id,
flavor,
draining: state.drain_timeout_ts.is_some(),
clear: false,
}),
))
Expand Down Expand Up @@ -254,6 +256,7 @@ pub async fn pegboard_client(ctx: &mut WorkflowCtx, input: &Input) -> GlobalResu
ctx.activity(UpdateMetricsInput {
client_id: input.client_id,
flavor: input.flavor,
draining: false,
clear: true,
})
.await?;
Expand Down Expand Up @@ -691,6 +694,7 @@ pub async fn handle_commands(
activity(UpdateMetricsInput {
client_id,
flavor,
draining: drain_timeout_ts.is_some(),
clear: false,
}),
))
Expand Down Expand Up @@ -933,24 +937,75 @@ async fn check_expired(ctx: &ActivityCtx, input: &CheckExpiredInput) -> GlobalRe
struct UpdateMetricsInput {
client_id: Uuid,
flavor: ClientFlavor,
#[serde(default)]
draining: bool,
clear: bool,
}

#[activity(UpdateMetrics)]
async fn update_metrics(ctx: &ActivityCtx, input: &UpdateMetricsInput) -> GlobalResult<()> {
if input.clear {
metrics::CLIENT_MEMORY_TOTAL
.with_label_values(&[
&input.client_id.to_string(),
&input.flavor.to_string(),
"active",
])
.set(0);
metrics::CLIENT_CPU_TOTAL
.with_label_values(&[
&input.client_id.to_string(),
&input.flavor.to_string(),
"active",
])
.set(0);
metrics::CLIENT_MEMORY_TOTAL
.with_label_values(&[
&input.client_id.to_string(),
&input.flavor.to_string(),
"draining",
])
.set(0);
metrics::CLIENT_CPU_TOTAL
.with_label_values(&[
&input.client_id.to_string(),
&input.flavor.to_string(),
"draining",
])
.set(0);
metrics::CLIENT_MEMORY_ALLOCATED
.with_label_values(&[&input.client_id.to_string(), &input.flavor.to_string()])
.with_label_values(&[
&input.client_id.to_string(),
&input.flavor.to_string(),
"active",
])
.set(0);

metrics::CLIENT_CPU_ALLOCATED
.with_label_values(&[&input.client_id.to_string(), &input.flavor.to_string()])
.with_label_values(&[
&input.client_id.to_string(),
&input.flavor.to_string(),
"active",
])
.set(0);
metrics::CLIENT_MEMORY_ALLOCATED
.with_label_values(&[
&input.client_id.to_string(),
&input.flavor.to_string(),
"draining",
])
.set(0);
metrics::CLIENT_CPU_ALLOCATED
.with_label_values(&[
&input.client_id.to_string(),
&input.flavor.to_string(),
"draining",
])
.set(0);

return Ok(());
}

let (total_mem, total_cpu, remaining_mem, remaining_cpu) =
let (total_mem, remaining_mem, total_cpu, remaining_cpu) =
ctx.fdb()
.await?
.run(|tx, _mc| async move {
Expand Down Expand Up @@ -992,35 +1047,80 @@ async fn update_metrics(ctx: &ActivityCtx, input: &UpdateMetricsInput) -> Global
)
.map_err(|x| fdb::FdbBindingError::CustomError(x.into()))?;

Ok((
total_mem,
remaining_mem,
total_cpu,
remaining_cpu,
))
Ok((total_mem, remaining_mem, total_cpu, remaining_cpu))
})
.custom_instrument(tracing::info_span!("client_update_metrics_tx"))
.await?;

let (state, other_state) = if input.draining {
("draining", "active")
} else {
("active", "draining")
};
let allocated_mem = total_mem.saturating_sub(remaining_mem);
let allocated_cpu = total_cpu.saturating_sub(remaining_cpu);

metrics::CLIENT_MEMORY_TOTAL
.with_label_values(&[&input.client_id.to_string(), &input.flavor.to_string()])
.with_label_values(&[
&input.client_id.to_string(),
&input.flavor.to_string(),
state,
])
.set(total_mem.try_into()?);

metrics::CLIENT_CPU_TOTAL
.with_label_values(&[&input.client_id.to_string(), &input.flavor.to_string()])
.with_label_values(&[
&input.client_id.to_string(),
&input.flavor.to_string(),
state,
])
.set(total_cpu.try_into()?);

let allocated_mem = total_mem.saturating_sub(remaining_mem);
let allocated_cpu = total_cpu.saturating_sub(remaining_cpu);

metrics::CLIENT_MEMORY_ALLOCATED
.with_label_values(&[&input.client_id.to_string(), &input.flavor.to_string()])
.with_label_values(&[
&input.client_id.to_string(),
&input.flavor.to_string(),
state,
])
.set(allocated_mem.try_into()?);

metrics::CLIENT_CPU_ALLOCATED
.with_label_values(&[&input.client_id.to_string(), &input.flavor.to_string()])
.with_label_values(&[
&input.client_id.to_string(),
&input.flavor.to_string(),
state,
])
.set(allocated_cpu.try_into()?);

// Clear other state
metrics::CLIENT_MEMORY_TOTAL
.with_label_values(&[
&input.client_id.to_string(),
&input.flavor.to_string(),
other_state,
])
.set(0);
metrics::CLIENT_CPU_TOTAL
.with_label_values(&[
&input.client_id.to_string(),
&input.flavor.to_string(),
other_state,
])
.set(0);

metrics::CLIENT_MEMORY_ALLOCATED
.with_label_values(&[
&input.client_id.to_string(),
&input.flavor.to_string(),
other_state,
])
.set(0);
metrics::CLIENT_CPU_ALLOCATED
.with_label_values(&[
&input.client_id.to_string(),
&input.flavor.to_string(),
other_state,
])
.set(0);

Ok(())
}

Expand Down
Loading