mirror of
https://github.com/openziti/ziti.git
synced 2026-10-23 20:26:05 +00:00
444999bc5b
- adds RemoveTerminatorsV2, an asynchronous control-channel removal, so a router no longer holds a request slot open waiting for a synchronous reply; gated on a new capability so routers fall back to the synchronous path against controllers that do not advertise it - paces establish and remove retries with a per-terminator exponential backoff after a controller rejection, so a rejected operation is not re-sent on the next event-loop tick, which is what let a rate-limited removal sustain itself - routes v2 removes to the leader and skips the ordered delete for a terminator the router confirms it created that no longer exists, so a storm of no-op retries cannot consume the command rate limiter - gates that skip on the leader having applied everything committed when it took leadership, since a leader reports itself elected before those applies finish and would otherwise read a committed create as absent and drop its delete - guards the leader term and every write to the caught-up flag with a dedicated lock, so a barrier completing alongside a leadership change cannot record a result for a term that has already ended - scopes v2 removals to the requesting router, so a router can only remove terminators it owns on the asynchronous path as well as the synchronous one - tracks in-flight removal batches on the router, resolving or requeueing them when the response arrives; lost responses self-heal via rate-limiter expiry and the retry scan - waits for an outstanding operation before sending a terminator delete, and checks that before dequeuing, so a delete neither races a create the controller has committed but not applied nor falls out of the queue until the retry scan finds it minutes later - matches a create response to the attempt that produced it, by control channel and reply sequence, since attempts overlap once one overruns the establishment timeout and every attempt carries the same terminator id; only the outstanding attempt's response may confirm the create or report the terminator idle - records the attempt as the sender assigns its sequence, so a response cannot be processed before the request it answers is known, and withdraws an attempt whose send never queued - reports a removal that succeeds past the establishment timeout as congestion rather than success, matching how the establish path classifies its own latency, since both resolve into the same limiter - extracts the transient-error test both remove handlers share, so the v2 path treats a leaderless cluster as busy like v1 does instead of as a permanent failure, and the two cannot drift again - applies the same delete sequencing and response correlation to the router-hosted (ER/T) registry, which cleared the same in-flight marker unguarded and dropped a deferred delete from its queue rather than leaving it there - bounds the v2 response send with a timeout, so a router that stops draining its send queue cannot accumulate blocked responder goroutines on the controller
195 lines
7.9 KiB
Go
195 lines
7.9 KiB
Go
/*
|
|
Copyright NetFoundry Inc.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
https://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package handler_ctrl
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/openziti/ziti/v2/controller/apierror"
|
|
"github.com/openziti/ziti/v2/controller/model"
|
|
"github.com/openziti/ziti/v2/controller/models"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func Test_filterRemovableTerminators(t *testing.T) {
|
|
const me = "router-me"
|
|
|
|
// mine: present, owned by the requesting router; other: present, owned by a different router;
|
|
// gone: not present; err: lookup fails.
|
|
lookup := func(id string) (string, bool, error) {
|
|
switch id {
|
|
case "mine":
|
|
return me, true, nil
|
|
case "other":
|
|
return "router-other", true, nil
|
|
case "err":
|
|
return "", false, errors.New("boom")
|
|
default: // "gone" and anything else
|
|
return "", false, nil
|
|
}
|
|
}
|
|
|
|
t.Run("not caught up keeps owned and absent ids", func(t *testing.T) {
|
|
req := require.New(t)
|
|
kept, rejected, skipped := filterRemovableTerminators([]string{"gone", "mine"}, []bool{true, true}, me, false, lookup)
|
|
req.Equal([]string{"gone", "mine"}, kept)
|
|
req.Zero(rejected)
|
|
req.Zero(skipped, "absence proves nothing until the leader has applied what it committed")
|
|
})
|
|
|
|
// A leader that has won its election but not finished applying can read a committed create as
|
|
// absent. Skipping there drops the delete, the router forgets the terminator, and the create then
|
|
// applies, leaving a terminator no router hosts.
|
|
t.Run("a confirmed create absent on a leader that is not caught up is still deleted", func(t *testing.T) {
|
|
req := require.New(t)
|
|
kept, _, skipped := filterRemovableTerminators([]string{"gone"}, []bool{true}, me, false, lookup)
|
|
req.Equal([]string{"gone"}, kept, "the delete must still be ordered after the create")
|
|
req.Zero(skipped)
|
|
})
|
|
|
|
// Ownership does not depend on being caught up: it only acts on ids that resolve, and a resolved
|
|
// id is one the local view already has.
|
|
t.Run("ownership is enforced even when not caught up", func(t *testing.T) {
|
|
req := require.New(t)
|
|
kept, rejected, skipped := filterRemovableTerminators([]string{"other", "mine"}, nil, me, false, lookup)
|
|
req.Equal([]string{"mine"}, kept)
|
|
req.Equal(1, rejected)
|
|
req.Zero(skipped)
|
|
})
|
|
|
|
t.Run("rejects ids owned by another router", func(t *testing.T) {
|
|
req := require.New(t)
|
|
kept, rejected, skipped := filterRemovableTerminators([]string{"other", "mine"}, nil, me, true, lookup)
|
|
req.Equal([]string{"mine"}, kept, "a router may only remove terminators it owns")
|
|
req.Equal(1, rejected)
|
|
req.Zero(skipped)
|
|
})
|
|
|
|
t.Run("rejects every id when none are owned", func(t *testing.T) {
|
|
req := require.New(t)
|
|
kept, rejected, skipped := filterRemovableTerminators([]string{"other", "other"}, nil, me, true, lookup)
|
|
req.Empty(kept, "an all-foreign batch must delete nothing")
|
|
req.Equal(2, rejected)
|
|
req.Zero(skipped)
|
|
})
|
|
|
|
t.Run("rejects another router's id even when confirmed on the leader", func(t *testing.T) {
|
|
req := require.New(t)
|
|
kept, rejected, skipped := filterRemovableTerminators([]string{"other"}, []bool{true}, me, true, lookup)
|
|
req.Empty(kept)
|
|
req.Equal(1, rejected)
|
|
req.Zero(skipped)
|
|
})
|
|
|
|
t.Run("leader skips confirmed and absent", func(t *testing.T) {
|
|
req := require.New(t)
|
|
kept, rejected, skipped := filterRemovableTerminators([]string{"gone"}, []bool{true}, me, true, lookup)
|
|
req.Empty(kept, "a confirmed, already-removed terminator must be skipped")
|
|
req.Zero(rejected)
|
|
req.Equal(1, skipped)
|
|
})
|
|
|
|
t.Run("leader keeps confirmed but still present", func(t *testing.T) {
|
|
req := require.New(t)
|
|
kept, rejected, skipped := filterRemovableTerminators([]string{"mine"}, []bool{true}, me, true, lookup)
|
|
req.Equal([]string{"mine"}, kept, "a terminator that still exists must go through the ordered delete")
|
|
req.Zero(rejected)
|
|
req.Zero(skipped)
|
|
})
|
|
|
|
t.Run("leader keeps unconfirmed even when absent", func(t *testing.T) {
|
|
req := require.New(t)
|
|
kept, _, skipped := filterRemovableTerminators([]string{"gone"}, []bool{false}, me, true, lookup)
|
|
req.Equal([]string{"gone"}, kept, "an unconfirmed create may be committed but not yet applied, so it must not be skipped")
|
|
req.Zero(skipped)
|
|
})
|
|
|
|
t.Run("nil createConfirmed treats every id as unconfirmed", func(t *testing.T) {
|
|
req := require.New(t)
|
|
// The v1 request carries no confirmation, so absent ids are kept (ownership still applies).
|
|
kept, rejected, skipped := filterRemovableTerminators([]string{"gone", "other", "mine"}, nil, me, true, lookup)
|
|
req.Equal([]string{"gone", "mine"}, kept)
|
|
req.Equal(1, rejected)
|
|
req.Zero(skipped)
|
|
})
|
|
|
|
t.Run("leader treats a missing createConfirmed entry as false", func(t *testing.T) {
|
|
req := require.New(t)
|
|
// createConfirmed shorter than ids (e.g. an older router) -> the uncovered id is unconfirmed
|
|
kept, _, skipped := filterRemovableTerminators([]string{"gone", "gone"}, []bool{true}, me, true, lookup)
|
|
req.Equal([]string{"gone"}, kept, "the id without a createConfirmed entry must be kept")
|
|
req.Equal(1, skipped)
|
|
})
|
|
|
|
t.Run("a lookup error keeps the id", func(t *testing.T) {
|
|
req := require.New(t)
|
|
kept, rejected, skipped := filterRemovableTerminators([]string{"err"}, []bool{true}, me, true, lookup)
|
|
req.Equal([]string{"err"}, kept, "a lookup error must fall back to keeping the id")
|
|
req.Zero(rejected, "an unresolved owner must not be treated as an ownership violation")
|
|
req.Zero(skipped)
|
|
})
|
|
|
|
t.Run("leader mixes kept, rejected and skipped correctly", func(t *testing.T) {
|
|
req := require.New(t)
|
|
kept, rejected, skipped := filterRemovableTerminators(
|
|
[]string{"gone", "mine", "other", "gone", "err"},
|
|
[]bool{true, true, true, false, true},
|
|
me, true, lookup)
|
|
req.Equal([]string{"mine", "gone", "err"}, kept)
|
|
req.Equal(1, rejected)
|
|
req.Equal(1, skipped)
|
|
})
|
|
}
|
|
|
|
// Test_ownsTerminator covers the single-terminator check used by the remove and update handlers,
|
|
// which reject outright rather than filtering.
|
|
func Test_ownsTerminator(t *testing.T) {
|
|
handler := &baseHandler{router: &model.Router{BaseEntity: models.BaseEntity{Id: "router-me"}}}
|
|
|
|
t.Run("owned by the requesting router", func(t *testing.T) {
|
|
require.True(t, handler.ownsTerminator(&model.Terminator{Router: "router-me"}))
|
|
})
|
|
|
|
t.Run("owned by a different router", func(t *testing.T) {
|
|
require.False(t, handler.ownsTerminator(&model.Terminator{Router: "router-other"}))
|
|
})
|
|
|
|
t.Run("unset owner", func(t *testing.T) {
|
|
require.False(t, handler.ownsTerminator(&model.Terminator{}),
|
|
"a terminator with no owner must not be treated as owned by the requester")
|
|
})
|
|
}
|
|
|
|
// Test_wasControllerBusy covers the classification both remove handlers share. A leaderless cluster
|
|
// during a membership change is transient like rate limiting, and reporting it as a permanent failure
|
|
// leaves the router resolving its limiter handle neutrally instead of backing off.
|
|
func Test_wasControllerBusy(t *testing.T) {
|
|
req := require.New(t)
|
|
|
|
req.True(wasControllerBusy(apierror.NewTooManyUpdatesError()), "rate limiting is transient")
|
|
req.True(wasControllerBusy(apierror.NewClusterHasNoLeaderError()), "a leaderless cluster is transient")
|
|
// Real call sites wrap before returning, so the classification has to see through it.
|
|
var leaderless error = apierror.NewClusterHasNoLeaderError()
|
|
req.True(wasControllerBusy(fmt.Errorf("failed to send request (%w)", leaderless)),
|
|
"the classification must survive wrapping")
|
|
|
|
req.False(wasControllerBusy(errors.New("something else")), "an unrelated error is not transient")
|
|
req.False(wasControllerBusy(nil), "no error is not transient")
|
|
}
|