Skip to content

Commit 28b375c

Browse files
fristoniojoestringer
authored andcommitted
endpoint: reduce missed policy revision log severity to info
Currently policy repository version can be bumped through multiple triggers, async to each other. This can lead to out of order processing of regeneration events for an endpoint, which are reported as missing a policy revision. This commit reduces the severity of this log to Info. This is a short term fix to reduce CI flakes: cilium#36493 (comment) Signed-off-by: Deepesh Pathak <deepesh.pathak@isovalent.com>
1 parent 95f49ea commit 28b375c

1 file changed

Lines changed: 8 additions & 14 deletions

File tree

pkg/endpoint/policy.go

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -682,20 +682,14 @@ func (e *Endpoint) UpdatePolicy(idsToRegen *set.Set[identityPkg.NumericIdentity]
682682
// bump the policy revision directly (as long as we didn't miss an update somehow).
683683
if !idsToRegen.Has(secID) {
684684
if e.policyRevision < fromRev {
685-
if e.state == StateWaitingToRegenerate || e.state == StateRestoring {
686-
// We can log this at less severity since a regeneration was already queued.
687-
// This can happen if two policy updates come in quick succession, with the first
688-
// affecting this endpoint and the second not.
689-
e.getLogger().Info(
690-
"Endpoint missed a policy revision; triggering regeneration",
691-
logfields.PolicyRevision, fromRev,
692-
)
693-
} else {
694-
e.getLogger().Warn(
695-
"Endpoint missed a policy revision; triggering regeneration",
696-
logfields.PolicyRevision, fromRev,
697-
)
698-
}
685+
// FIXME: https://github.com/cilium/cilium/issues/36493
686+
// Currently policy repository version can be bumped through multiple triggers
687+
// async to each other. This can lead to out of order processing of regeneration
688+
// events. Continue with endpoint regeneration to be safe but log as Info.
689+
e.getLogger().Info(
690+
"Endpoint missed a policy revision; triggering regeneration",
691+
logfields.PolicyRevision, fromRev,
692+
)
699693
} else {
700694
e.getLogger().Debug(
701695
"Policy update is a no-op, bumping policyRevision",

0 commit comments

Comments
 (0)