Prune Unhealthy Agents #6571
Prune Unhealthy Agents #6571
Conversation
command/forceleave/forceleave.go
Outdated
| if err != nil { | ||
| c.UI.Error(fmt.Sprintf("Error force leaving: %s", err)) | ||
| return 1 | ||
| switch c.prune { |
There was a problem hiding this comment.
It seems more natural to use if c.prune { ... } else { ... } instead of a boolean switch statement here.
Also you can move the common error handling outside of the conditional block, like:
if c.prune {
err = client.Agent().ForceLeavePrune(...)
} else {
err = client.Agent().ForceLeave(...)
}
if err != nil {
...
}
There was a problem hiding this comment.
When you say natural, do you mean easier to read? Or what do you mean by natural?
Not against your suggestion, but I'm wondering which is more idiomatic but also user friendly? I've been going back and forth on which is better, why, and when to use a switch versus an if/else. Feedback would be amazing ❤️
(Perhaps it's more like the rest of Consul code to be an if/else 🤷♀ ?)
|
Since you are changing the HTTP API for /v1/agent/force-leave you should also update the API docs in the website as well. |
Co-Authored-By: R.B. Boyer <rb@hashicorp.com>
Co-Authored-By: R.B. Boyer <rb@hashicorp.com>
…s, general cleanup
|
Necessary Serf stuff has been added and re-vendored. 🤞 Updated those API docs, as well. |
Co-Authored-By: R.B. Boyer <rb@hashicorp.com>
Co-Authored-By: R.B. Boyer <rb@hashicorp.com>
Co-Authored-By: R.B. Boyer <rb@hashicorp.com>
Co-Authored-By: R.B. Boyer <rb@hashicorp.com>
Co-Authored-By: R.B. Boyer <rb@hashicorp.com>
* Add -prune flag to ForceLeave
Note: #580 in Serf needs to be merged, Serf to be tagged, Consul re-vendored and the go.mod updated.
This allows for users to remove unhealthy agents by adding the
-pruneflag in the CLI. This will completely remove the agent from the list of members.If you are pruning a server from WAN you should specify your command like such
consul force-leave -prune nodename.datacenter, as the formatting that we have added doesn't always work.Fixes #2981