From 4bdcef3f73b547a206393758b838458853990602 Mon Sep 17 00:00:00 2001 From: jochen Date: Tue, 13 Oct 2026 19:24:02 +0200 Subject: [PATCH] List the settings walk's store tests, and drop a refusal check that never matched (issue 641 review) A store test not named in testdata/store-tests skips unseen without a store (issue 459). The check after the send could not match: the send turns its refusals into words; the composition before it already fails the walk. --- cmd/mesh-controller/settings_walk.go | 7 ++----- testdata/store-tests | 7 +++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmd/mesh-controller/settings_walk.go b/cmd/mesh-controller/settings_walk.go index 8c5acb3b..e5d69db6 100644 --- a/cmd/mesh-controller/settings_walk.go +++ b/cmd/mesh-controller/settings_walk.go @@ -193,12 +193,9 @@ func advanceSettingsWalk(ctx context.Context, open *stores, p *inventory.Plan) ( return failBefore(p, node, "a running module's data would move there — "+ strings.Join(strings.Fields(said.String()), " ")) } + // A build that cannot be kept is refused by the composition above, which is the send's own, and fails the + // walk there: the send flattens its refusals into words, so it is not looked for again here. sent, grants, err := sendJudged(keepingBuildsForSettings(ctx, node), open, node) - if errors.Is(err, errSettingsCannotKeep) { - // It does not clear by itself: tried again on every tick, the walk would stay open and hold the walk - // of waiting builds until a person came. - return failBefore(p, node, err.Error()) - } if err != nil { return false, fmt.Errorf("sending %s %s: %w", node, settingsWalkFor(*s), err) } diff --git a/testdata/store-tests b/testdata/store-tests index bec8145d..8f592653 100644 --- a/testdata/store-tests +++ b/testdata/store-tests @@ -51,3 +51,10 @@ ./internal/inventory TestASharedOwnSecretIssuedOutsideIsNeverMade ./cmd/mesh-controller TestOneAcceptForAProviderIsPlacedForEveryConsumer ./cmd/mesh-controller TestReplay164 +./cmd/mesh-controller TestAnApprovedLayerOpensTheWalkThatSendsIt +./cmd/mesh-controller TestASettingsWalkSendsOneMachineAtATimeEachJudged +./cmd/mesh-controller TestAFailedSettingsWalkStopsAndHoldsNothingBack +./cmd/mesh-controller TestASettingsWalkSendsTheLayerAloneEveryBuildKept +./cmd/mesh-controller TestASettingsWalkStopsBeforeADataMoveAndPassesOverAMachineAway +./cmd/mesh-controller TestACrossingSendSupersedesASettingsGate +./cmd/mesh-controller TestASettingsWalkFailsOnARefusalThatCannotClear