forked from Deuxfleurs/garage
cli: remove historic layout info from status
This commit is contained in:
parent
11e6fef93c
commit
c539077d30
1 changed files with 0 additions and 18 deletions
|
@ -91,15 +91,6 @@ pub async fn cmd_status(rpc_cli: &Endpoint<SystemRpc, ()>, rpc_host: NodeID) ->
|
||||||
Some(NodeRoleV(Some(cfg))) => Some(cfg),
|
Some(NodeRoleV(Some(cfg))) => Some(cfg),
|
||||||
_ => None,
|
_ => None,
|
||||||
});
|
});
|
||||||
let historic_role =
|
|
||||||
layout
|
|
||||||
.old_versions
|
|
||||||
.iter()
|
|
||||||
.rev()
|
|
||||||
.find_map(|x| match x.roles.get(&adv.id) {
|
|
||||||
Some(NodeRoleV(Some(cfg))) => Some(cfg),
|
|
||||||
_ => None,
|
|
||||||
});
|
|
||||||
if let Some(cfg) = prev_role {
|
if let Some(cfg) = prev_role {
|
||||||
healthy_nodes.push(format!(
|
healthy_nodes.push(format!(
|
||||||
"{id:?}\t{host}\t{addr}\t[{tags}]\t{zone}\tdraining metadata...",
|
"{id:?}\t{host}\t{addr}\t[{tags}]\t{zone}\tdraining metadata...",
|
||||||
|
@ -109,15 +100,6 @@ pub async fn cmd_status(rpc_cli: &Endpoint<SystemRpc, ()>, rpc_host: NodeID) ->
|
||||||
tags = cfg.tags.join(","),
|
tags = cfg.tags.join(","),
|
||||||
zone = cfg.zone,
|
zone = cfg.zone,
|
||||||
));
|
));
|
||||||
} else if let Some(cfg) = historic_role {
|
|
||||||
healthy_nodes.push(format!(
|
|
||||||
"{id:?}\t{host}\t{addr}\t[{tags}]\t{zone}\tremoved, metadata drained",
|
|
||||||
id = adv.id,
|
|
||||||
host = adv.status.hostname,
|
|
||||||
addr = adv.addr,
|
|
||||||
tags = cfg.tags.join(","),
|
|
||||||
zone = cfg.zone,
|
|
||||||
));
|
|
||||||
} else {
|
} else {
|
||||||
let new_role = match layout.staging.get().roles.get(&adv.id) {
|
let new_role = match layout.staging.get().roles.get(&adv.id) {
|
||||||
Some(NodeRoleV(Some(_))) => "pending...",
|
Some(NodeRoleV(Some(_))) => "pending...",
|
||||||
|
|
Loading…
Reference in a new issue