From 08e7efdfa0c52a7d61a18594fe4eeff917cce832 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Fri, 9 Jun 2023 10:28:29 -0400 Subject: [PATCH] Make quiesce/dequiesce hidden for now until full feature is available --- CHANGELOG.md | 18 ------------------ ziti/cmd/agentcli/agent.go | 10 ++++++++-- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 444de2592..f5630048d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,24 +4,6 @@ * `ziti` CLI now trims jwt files specified for login preventing a confusing invalid header field value for "Authorization" error when trying to use `-e` flag -* Support quiesce/dequiesce of routers for auto-scaling and/or round-robin upgrades - -## Quiesce/Dequiesce Routers - -The ziti CLI supports two new operations: - -* `ziti agent router quiesce` -* `ziti agent router dequiesce` - -When told to quiesce, the targeted router will reach out to the controller and request that its terminators be marked as -failed. All terminators that aren't already in a failed state will be marked as failed, and the their previous -precedence will be saved. - -New circuits will then prefer terminators on other routers, where they are available. This will allow for graceful -turn down of autoscaled routers or for round-robinning routers while upgrading. - -If a server has been quiesced and is now ready to be returned to service, it can be dequiesced. This will find -terminators with a saved precedence in a failed state and return them to their original state. ## Router Health Check Changes diff --git a/ziti/cmd/agentcli/agent.go b/ziti/cmd/agentcli/agent.go index 3ce0d77a3..5db2a301d 100644 --- a/ziti/cmd/agentcli/agent.go +++ b/ziti/cmd/agentcli/agent.go @@ -95,12 +95,18 @@ func NewAgentCmd(p common.OptionsProvider) *cobra.Command { routerCmd.AddCommand(NewSimpleAgentCustomCmd("dump-api-sessions", AgentAppRouter, debugops.DumpApiSessions, p)) routerCmd.AddCommand(NewSimpleChAgentCustomCmd("dump-routes", AgentAppRouter, int32(mgmt_pb.ContentType_RouterDebugDumpForwarderTablesRequestType), p)) routerCmd.AddCommand(NewSimpleChAgentCustomCmd("dump-links", AgentAppRouter, int32(mgmt_pb.ContentType_RouterDebugDumpLinksRequestType), p)) - routerCmd.AddCommand(NewSimpleChAgentCustomCmd("quiesce", AgentAppRouter, int32(mgmt_pb.ContentType_RouterQuiesce), p)) - routerCmd.AddCommand(NewSimpleChAgentCustomCmd("dequiesce", AgentAppRouter, int32(mgmt_pb.ContentType_RouterDequiesce), p)) routerCmd.AddCommand(NewForgetLinkAgentCmd(p)) routerCmd.AddCommand(NewToggleCtrlChannelAgentCmd(p, "disconnect", false)) routerCmd.AddCommand(NewToggleCtrlChannelAgentCmd(p, "reconnect", true)) + quiesceCmd := NewSimpleChAgentCustomCmd("quiesce", AgentAppRouter, int32(mgmt_pb.ContentType_RouterQuiesce), p) + quiesceCmd.Hidden = true + routerCmd.AddCommand(quiesceCmd) + + dequiesceCmd := NewSimpleChAgentCustomCmd("dequiesce", AgentAppRouter, int32(mgmt_pb.ContentType_RouterDequiesce), p) + dequiesceCmd.Hidden = true + routerCmd.AddCommand(dequiesceCmd) + return agentCmd }