fix: use a monotonic clock for the cache polling timeout - #3529
Draft
csviri wants to merge 1 commit into
Draft
Conversation
`pollLocalCache` computed its deadline with `LocalTime`:
var startTime = LocalTime.now();
final var timeoutTime = startTime.plus(timeoutMillis, ChronoUnit.MILLIS);
while (timeoutTime.isAfter(LocalTime.now())) {
`LocalTime` is a time of day and wraps at midnight, so for any call made
within `timeoutMillis` of 00:00 the computed deadline is *earlier* than
the current time. The loop body never runs and the method throws
`OperatorException("Timeout of resource polling from cache for resource")`
immediately, failing the update it was retrying even though the resource
would have appeared in cache. With the default 10s timeout that is a
10-second window each day.
`LocalTime.now()` is also wall-clock based, so an NTP step or a DST change
can shorten or extend the timeout.
Switches to `System.nanoTime()`, which is monotonic and has no wrap-around
concern, using overflow-safe subtraction for the comparison.
No test is added: reproducing this requires controlling the clock, and the
class is already deprecated for removal.
openshift-ci
Bot
added
the
do-not-merge/work-in-progress
16 tasks
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a correctness issue in PrimaryUpdateAndCacheUtils.pollLocalCache where the cache-polling timeout was computed using LocalTime (time-of-day), which can wrap at midnight and is susceptible to wall-clock adjustments. It switches the timeout tracking to a monotonic clock so the polling loop behaves consistently.
Changes:
- Replace
LocalTime/ChronoUnitdeadline computation with aSystem.nanoTime()-based timeout. - Use
TimeUnit.MILLISECONDS.toNanos(...)to convert the configured timeout into nanoseconds. - Remove now-unneeded
java.timeimports.
Comment on lines
233
to
+235
| var resourceId = ResourceID.fromResource(staleResource); | ||
| var startTime = LocalTime.now(); | ||
| final var timeoutTime = startTime.plus(timeoutMillis, ChronoUnit.MILLIS); | ||
| while (timeoutTime.isAfter(LocalTime.now())) { | ||
| final var deadlineNanos = System.nanoTime() + TimeUnit.MILLISECONDS.toNanos(timeoutMillis); | ||
| while (System.nanoTime() - deadlineNanos < 0) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
pollLocalCachecomputed its deadline withLocalTime:LocalTimeis a time of day and wraps at midnight, so for any call madewithin
timeoutMillisof 00:00 the computed deadline is earlier thanthe current time. The loop body never runs and the method throws
OperatorException("Timeout of resource polling from cache for resource")immediately, failing the update it was retrying even though the resource
would have appeared in cache. With the default 10s timeout that is a
10-second window each day.
LocalTime.now()is also wall-clock based, so an NTP step or a DST changecan shorten or extend the timeout.
Switches to
System.nanoTime(), which is monotonic and has no wrap-aroundconcern, using overflow-safe subtraction for the comparison.
No test is added: reproducing this requires controlling the clock, and the
class is already deprecated for removal.
Part of #3517