Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/fixed-17142.md
Original file line number Diff line number Diff line change
@@ -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).
2 changes: 1 addition & 1 deletion src/docs/fleet-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 11 additions & 5 deletions src/pkg/fleetreport/slogfeed/slogfeed.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
34 changes: 23 additions & 11 deletions src/pkg/fleetreport/slogfeed/slogfeed_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
})
}
}
Loading