Skip to content

11622 : OutlierDetection should use Ticker, not TimeProvider #12110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ejona86 merged 8 commits into from
Jun 16, 2025
Merged

11622 : OutlierDetection should use Ticker, not TimeProvider #12110

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ec44974
11622 : OutlierDetection should use Ticker, not TimeProvider
vimanikag May 29, 2025
8f513b7
11622 : OutlierDetection should use Ticker, not TimeProvider
vimanikag May 29, 2025
debbd7a
11243 : RLS cleanups
vimanikag Jun 3, 2025
3735a6c
11622 : OutlierDetection should use Ticker, not TimeProvider
vimanikag Jun 3, 2025
c831f1e
11622 : OutlierDetection should use Ticker, not TimeProvider
vimanikag Jun 4, 2025
b8c0e0c
11622 : OutlierDetection should use Ticker, not TimeProvider
vimanikag Jun 6, 2025
aaf5016
11622 : OutlierDetection should use Ticker, not TimeProvider
vimanikag Jun 9, 2025
e336fa6
Merge branch 'grpc:master' into vimanikag-FIX_11622_OTP
vimanikag Jun 12, 2025
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
Prev Previous commit
Next Next commit
11622 : OutlierDetection should use Ticker, not TimeProvider
  • Loading branch information
@vimanikag
vimanikag committed Jun 3, 2025
commit 3735a6c5d54b0b02b19812143bcadcad8d781992
3 changes: 2 additions & 1 deletion binder/src/main/java/io/grpc/binder/internal/PingTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,10 @@ private synchronized void fail(Status status) {
}

private synchronized void success() {
long currentTickerTimeNanos = ticker.read();
if (!done) {
done = true;
executor.execute(() -> callback.onSuccess(ticker.read() - startTimeNanos));
executor.execute(() -> callback.onSuccess(currentTickerTimeNanos - startTimeNanos));
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion netty/src/main/java/io/grpc/netty/AbstractNettyHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ public void updateWindow() throws Http2Exception {
pingReturn++;
setPinging(false);

long elapsedTime = (ticker.read() - lastPingTime);

@shivaspeaks shivaspeaks Jun 6, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was fine I believe, this doesn't need any change.

@vimanikag vimanikag Jun 6, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed the review comments

long currentTickerTimeNanos = ticker.read();
long elapsedTime = (currentTickerTimeNanos - lastPingTime);
if (elapsedTime == 0) {
elapsedTime = 1;
}
Expand Down
6 changes: 3 additions & 3 deletions util/src/main/java/io/grpc/util/OutlierDetectionLoadBalancer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,12 @@ public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
// On the first go we use the configured interval.
initialDelayNanos = config.intervalNanos;
} else {
Long currentTickerTimeNanos = ticker.read();
Long elepsedTimeNanos = currentTickerTimeNanos - detectionTimerStartNanos;
long currentTickerTimeNanos = ticker.read();
long elapsedTimeNanos = currentTickerTimeNanos - detectionTimerStartNanos;
// If a timer has started earlier we cancel it and use the difference between the start
// time and now as the interval.
initialDelayNanos = Math.max(0L,
config.intervalNanos - elepsedTimeNanos);
config.intervalNanos - elapsedTimeNanos);

@shivaspeaks shivaspeaks Jun 6, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can keep everything in-line here and above to make it less confusing. Storing in a variable doesn't change anything here, but sure you need to do Math.max(0L, ...) to not have any negative value there.

@vimanikag vimanikag Jun 6, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure , I have addressed the review comments and added negative values check and moved everything to single line but's build has failed as it's reaching to 100 characters in line hence I am planning split it two lines

Screenshot 2025-06-06 8 03 45 PM

@ejona86 ejona86 Jun 6, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The max is unnecessary. For it to overflow would require the process to be running for 292 years.

@vimanikag vimanikag Jun 9, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed the review comments

}

// If a timer has been previously created we need to cancel it and reset all the call counters
Expand Down