Skip to content

Fix process-tree generator #1257

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.

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
7 changes: 5 additions & 2 deletions lading/src/bin/lading.rs
Original file line number Diff line number Diff line change
@@ -139,7 +139,7 @@ impl FromStr for CliKeyValues {
#[clap(group(
ArgGroup::new("telemetry")
.required(true)
.args(&["capture_path", "prometheus_addr", "prometheus_path"]),
.args(&["capture_path", "prometheus_addr", "prometheus_path", "no_capture"]),
))]
#[clap(group(
ArgGroup::new("experiment-duration")
@@ -196,6 +196,9 @@ struct Opts {
/// capture-path
#[clap(long)]
prometheus_addr: Option<String>,
/// disable capture
#[clap(long)]
no_capture: bool,
/// the maximum time to wait, in seconds, for controlled shutdown
#[clap(long, default_value_t = 30)]
max_shutdown_delay: u16,
@@ -227,7 +230,7 @@ enum ExtraCommands {
#[clap(group(
ArgGroup::new("config")
.required(true)
.args(&["config-path", "config-content"]),
.args(&["config_path", "config_content"]),
))]
struct ProcessTreeGen {
/// path on disk to the configuration file
4 changes: 2 additions & 2 deletions lading/src/generator/process_tree.rs
Original file line number Diff line number Diff line change
@@ -320,9 +320,9 @@ impl ProcessTree {
loop {
tokio::select! {
_ = self.throttle.wait() => {
// using pid as target pid just to pass laging clap constraints
let output = Command::new(lading_path)
.args(["--target-pid", "1"])
.args(["--no-capture"])
.args(["--no-target"])
.arg("process-tree-gen")
.arg("--config-content")
.arg(&self.config_content)
Loading
Oops, something went wrong.