Skip to content
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

storcon_cli tenant-describe: include tenant-wide information in output #9899

Merged
merged 3 commits into from
Dec 3, 2024
Merged

storcon_cli tenant-describe: include tenant-wide information in output #9899

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cebfe97
storcon_cli tenant-describe: include tenant-wide information in output
problame Nov 26, 2024
7280d3c
fix test
problame Nov 27, 2024
ef70a70
https://github.com/neondatabase/neon/pull/9899#discussion_r1865669492
problame Dec 2, 2024
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
16 changes: 14 additions & 2 deletions control_plane/storcon_cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,14 +560,26 @@ async fn main() -> anyhow::Result<()> {
.await?;
}
Command::TenantDescribe { tenant_id } => {
let describe_response = storcon_client
let TenantDescribeResponse {
tenant_id,
shards,
stripe_size,
policy,
config,
} = storcon_client
.dispatch::<(), TenantDescribeResponse>(
Method::GET,
format!("control/v1/tenant/{tenant_id}"),
None,
)
.await?;
let shards = describe_response.shards;
println!("Tenant {tenant_id}");
let mut table = comfy_table::Table::new();
table.add_row(["Policy", &format!("{:?}", policy)]);
table.add_row(["Stripe size", &format!("{:?}", stripe_size)]);
table.add_row(["Config", &serde_json::to_string_pretty(&config).unwrap()]);
problame marked this conversation as resolved.
Show resolved Hide resolved
println!("{table}");
println!("Shards:");
let mut table = comfy_table::Table::new();
table.set_header(["Shard", "Attached", "Secondary", "Last error", "status"]);
for shard in shards {
Expand Down
3 changes: 1 addition & 2 deletions test_runner/regress/test_storage_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1747,8 +1747,7 @@ def storcon_cli(args):

# Describe a tenant
tenant_lines = storcon_cli(["tenant-describe", "--tenant-id", str(env.initial_tenant)])
assert len(tenant_lines) == 3 + shard_count * 2
problame marked this conversation as resolved.
Show resolved Hide resolved
assert str(env.initial_tenant) in tenant_lines[3]
assert str(env.initial_tenant) in tenant_lines[0]

# Pause changes on a tenant
storcon_cli(["tenant-policy", "--tenant-id", str(env.initial_tenant), "--scheduling", "stop"])
Expand Down
Loading