Publish release-5edbadb22804 filtered source
Private source: 5edbadb2280419cf2cb42b5237835304ad7040e0 Public tree identity: sha256:e0d4d5e1c8693959e69448684a71582edfc13e9b18d7f1e733034fea5ce62cda
This commit is contained in:
parent
b93aef4f25
commit
a9f6f8b7a9
12 changed files with 430 additions and 166 deletions
|
|
@ -1,6 +1,6 @@
|
|||
use clusterflux_core::{
|
||||
CommandInvocation, Digest, LogBuffer, NativeCommandPolicy, NodeId, TaskInstanceId, VfsObject,
|
||||
VfsOverlay, VfsPath,
|
||||
CommandInvocation, Digest, NativeCommandPolicy, NodeId, TaskInstanceId, VfsObject, VfsOverlay,
|
||||
VfsPath,
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
|
|
@ -113,24 +113,20 @@ impl LocalCommandExecutor {
|
|||
}
|
||||
|
||||
pub(super) fn capture_command_logs(
|
||||
task: &TaskInstanceId,
|
||||
_task: &TaskInstanceId,
|
||||
stdout: &[u8],
|
||||
stderr: &[u8],
|
||||
max_log_bytes: usize,
|
||||
) -> CapturedCommandLogs {
|
||||
let mut logs = LogBuffer::new(max_log_bytes);
|
||||
logs.push(task.clone(), stdout);
|
||||
logs.push(task.clone(), stderr);
|
||||
let records = logs.records();
|
||||
let stdout_record = &records[0];
|
||||
let stderr_record = &records[1];
|
||||
debug_assert_eq!(&stdout_record.task, task);
|
||||
debug_assert_eq!(&stderr_record.task, task);
|
||||
let stdout_truncated = stdout.len() > max_log_bytes;
|
||||
let stderr_truncated = stderr.len() > max_log_bytes;
|
||||
let stdout_start = stdout.len().saturating_sub(max_log_bytes);
|
||||
let stderr_start = stderr.len().saturating_sub(max_log_bytes);
|
||||
CapturedCommandLogs {
|
||||
stdout: String::from_utf8_lossy(&stdout_record.bytes).into_owned(),
|
||||
stderr: String::from_utf8_lossy(&stderr_record.bytes).into_owned(),
|
||||
stdout_truncated: stdout_record.truncated,
|
||||
stderr_truncated: stderr_record.truncated,
|
||||
backpressured: logs.backpressured(),
|
||||
stdout: String::from_utf8_lossy(&stdout[stdout_start..]).into_owned(),
|
||||
stderr: String::from_utf8_lossy(&stderr[stderr_start..]).into_owned(),
|
||||
stdout_truncated,
|
||||
stderr_truncated,
|
||||
backpressured: stdout_truncated || stderr_truncated,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue