Publish Clusterflux release candidate 6e83783
This commit is contained in:
parent
4d75257c6e
commit
f3640643bd
16 changed files with 4667 additions and 106 deletions
|
|
@ -7,7 +7,8 @@ use std::time::{Duration, Instant};
|
|||
use base64::{engine::general_purpose::STANDARD as BASE64_STANDARD, Engine as _};
|
||||
use clusterflux_core::{
|
||||
sign_node_request, signed_request_payload_digest, ArtifactId, Digest, NodeCapabilities, NodeId,
|
||||
TaskSpec, MIN_SIGNED_NODE_POLL_INTERVAL_MS,
|
||||
ProcessId, ProjectId, RequestId, TaskInstanceId, TaskSpec, TenantId,
|
||||
MIN_SIGNED_NODE_POLL_INTERVAL_MS,
|
||||
};
|
||||
use serde_json::{json, Value};
|
||||
|
||||
|
|
@ -222,7 +223,7 @@ fn worker_loop(
|
|||
let expiry = Instant::now()
|
||||
.checked_add(Duration::from_secs(retention_limits.restart_pin_seconds))
|
||||
.unwrap_or_else(Instant::now);
|
||||
restart_pins.insert(ArtifactId::new(artifact), expiry);
|
||||
restart_pins.insert(ArtifactId::try_new(artifact.to_owned())?, expiry);
|
||||
}
|
||||
println!("{}", serde_json::to_string(&report)?);
|
||||
std::io::stdout().flush()?;
|
||||
|
|
@ -289,7 +290,7 @@ fn service_pending_artifact_transfer(
|
|||
return Ok(false);
|
||||
};
|
||||
let transfer_id = required_string(transfer, "transfer_id")?;
|
||||
let artifact = ArtifactId::new(required_string(transfer, "artifact")?);
|
||||
let artifact = ArtifactId::try_new(required_string(transfer, "artifact")?)?;
|
||||
let expected_digest: Digest = serde_json::from_value(
|
||||
transfer
|
||||
.get("expected_digest")
|
||||
|
|
@ -369,9 +370,11 @@ pub(crate) fn runtime_task_from_assignment(
|
|||
.cloned()
|
||||
.ok_or("task assignment missing task_spec")?,
|
||||
)?;
|
||||
let process = ProcessId::try_new(required_string(value, "process")?)?;
|
||||
let task = TaskInstanceId::try_new(required_string(value, "task")?)?;
|
||||
Ok(RuntimeTask {
|
||||
process: required_string(value, "process")?,
|
||||
task: required_string(value, "task")?,
|
||||
process: process.to_string(),
|
||||
task: task.to_string(),
|
||||
epoch: value.get("epoch").and_then(Value::as_u64),
|
||||
bundle_digest: task_spec.bundle_digest.clone(),
|
||||
task_spec: Some(task_spec),
|
||||
|
|
@ -570,6 +573,12 @@ fn parse_args() -> Result<Args, Box<dyn std::error::Error>> {
|
|||
}
|
||||
}
|
||||
|
||||
TenantId::try_new(tenant.clone())?;
|
||||
ProjectId::try_new(project.clone())?;
|
||||
NodeId::try_new(node.clone())?;
|
||||
if let Some(grant) = enrollment_grant.as_ref() {
|
||||
RequestId::try_new(grant.clone())?;
|
||||
}
|
||||
Ok(Args {
|
||||
coordinator: coordinator.ok_or("--coordinator is required")?,
|
||||
tenant,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue