From f395cd355293304cad7ae3699eacdffed5037315 Mon Sep 17 00:00:00 2001 From: Karibhou Date: Sun, 8 Nov 2026 01:33:16 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(fleetreport):=20stage=20flap?= =?UTF-8?q?=20suppression=20is=20not=20an=20unclassified=20runtime=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The stage engine's same-head reversal guard (suppressStageFlap) logs "stage flap suppressed" at WARN each time it refuses to undo its last label write. That is the guard working as designed, but the slogfeed skip added in #17109 only matched the stage-label store's dampener message, so repeated suppressions still filed unclassified_error_repeated selfreports. Skip both messages in stageDampenerSuppression. Fixes #17142 Hive-Run: hivecommons/hive#17142 Hive-Plan: selfreport-triage Hive-Spec: fleet-report#slogfeed-skip-list Signed-off-by: Karibhou --- changelog.d/fixed-17142.md | 1 + src/docs/fleet-report.md | 2 +- src/pkg/fleetreport/slogfeed/slogfeed.go | 16 ++++++--- src/pkg/fleetreport/slogfeed/slogfeed_test.go | 34 +++++++++++++------ 4 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 changelog.d/fixed-17142.md diff --git a/changelog.d/fixed-17142.md b/changelog.d/fixed-17142.md new file mode 100644 index 0000000000..9015f9243a --- /dev/null +++ b/changelog.d/fixed-17142.md @@ -0,0 +1 @@ +- **fleetreport:** the stage engine's `stage flap suppressed` warning no longer files an `unclassified_error_repeated` fleet selfreport; refusing a same-head reversal is the flap guard working as designed and stays in local logs (#17142). diff --git a/src/docs/fleet-report.md b/src/docs/fleet-report.md index d9c357e5e6..52e605efb1 100644 --- a/src/docs/fleet-report.md +++ b/src/docs/fleet-report.md @@ -219,7 +219,7 @@ is not a repeated runtime defect (hivecommons/hive#16795). The WARN and its `minutes_since_kick` / `total_action_nudges` fields stay in local logs; actual nudge-delivery failures remain eligible for reporting when repeated. -It also skips `stage transition suppressed by dampener` (`stageDampenerSuppression`, `pkg/fleetreport/slogfeed/slogfeed.go`): the stage-label store suppresses flapping transitions during its dampener hold window (hivecommons/hive#17103). That is the dampener working as designed, not a runtime error. +It also skips `stage transition suppressed by dampener` (`stageDampenerSuppression`, `pkg/fleetreport/slogfeed/slogfeed.go`): the stage-label store suppresses flapping transitions during its dampener hold window (hivecommons/hive#17103). That is the dampener working as designed, not a runtime error. The same function skips `stage flap suppressed` (`suppressStageFlap`, `pkg/stageengine/writer.go`): the stage engine refuses a same-head, same-evidence reversal of its last label write inside its flap window (hivecommons/hive#17142). The re-engagement sweep logs `re-engagement kick undeliverable; budget not charged` at INFO rather than WARN when the cause is `shared session pool is diff --git a/src/pkg/fleetreport/slogfeed/slogfeed.go b/src/pkg/fleetreport/slogfeed/slogfeed.go index 091d210872..559d62ed97 100644 --- a/src/pkg/fleetreport/slogfeed/slogfeed.go +++ b/src/pkg/fleetreport/slogfeed/slogfeed.go @@ -228,12 +228,18 @@ func inferenceBlockedStall(r slog.Record) bool { return blocked } -// stageDampenerSuppression reports whether r is the stage-label store refusing -// a flapping transition ("stage transition suppressed by dampener"). That is -// the dampener working as designed, not a runtime error; the WARN stays in -// local logs (hivecommons/hive#17103). +// stageDampenerSuppression reports whether r is a stage guard refusing a +// flapping transition: the stage-label store's dampener ("stage transition +// suppressed by dampener", hivecommons/hive#17103) or the stage engine's +// same-head reversal guard ("stage flap suppressed", hivecommons/hive#17142). +// Both are the guard working as designed, not a runtime error; the WARN stays +// in local logs. func stageDampenerSuppression(r slog.Record) bool { - return strings.TrimSpace(r.Message) == "stage transition suppressed by dampener" + switch strings.TrimSpace(r.Message) { + case "stage transition suppressed by dampener", "stage flap suppressed": + return true + } + return false } // automergeMergeGuardSkip reports whether r is an automerge sweep lane diff --git a/src/pkg/fleetreport/slogfeed/slogfeed_test.go b/src/pkg/fleetreport/slogfeed/slogfeed_test.go index 4f53077926..2bea931702 100644 --- a/src/pkg/fleetreport/slogfeed/slogfeed_test.go +++ b/src/pkg/fleetreport/slogfeed/slogfeed_test.go @@ -1045,18 +1045,30 @@ func TestReviewRetryServerErrorLogsWithoutFleetReport(t *testing.T) { } } -// #17103: the stage dampener suppressing a flap is designed behaviour. +// #17103 / #17142: the stage dampener and the stage engine's reversal guard +// suppressing a flap are designed behaviour. func TestStageDampenerSuppressionLogsWithoutFleetReport(t *testing.T) { - logger, seen, out := newFeed(t) - for i := 0; i < 12; i++ { - logger.Warn("stage transition suppressed by dampener", - "key", "hivecommons/hive#17073", "head", "abc", "from", "071-needs-author", - "to", "050-review-pending", "reason", "base-refresh:queued-behind#17048") - } - if len(*seen) != 0 { - t.Errorf("produced observations: %+v", *seen) + cases := []struct { + msg string + attrs []any + }{ + {"stage transition suppressed by dampener", []any{"key", "hivecommons/hive#17073", "head", "abc", + "from", "071-needs-author", "to", "050-review-pending", "reason", "base-refresh:queued-behind#17048"}}, + {"stage flap suppressed", []any{"ref", "hivecommons/hive#17139", "head", "16a0c0c", + "from", "060-reviewed", "to", "050-review-pending", "reason", "base-refresh:queued-behind#17109"}}, } - if n := strings.Count(out.String(), "\n"); n != 12 { - t.Errorf("wrapped handler saw %d records, want 12", n) + for _, tc := range cases { + t.Run(tc.msg, func(t *testing.T) { + logger, seen, out := newFeed(t) + for range 12 { + logger.Warn(tc.msg, tc.attrs...) + } + if len(*seen) != 0 { + t.Errorf("produced observations: %+v", *seen) + } + if n := strings.Count(out.String(), "\n"); n != 12 { + t.Errorf("wrapped handler saw %d records, want 12", n) + } + }) } }