Skip to content

okhttp: Fix bidirectional keep-alive causing spurious GO_AWAY (1.77.x backport) #12506

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
merged 1 commit into from
Nov 13, 2025
+30 −5
Merged

okhttp: Fix bidirectional keep-alive causing spurious GO_AWAY (1.77.x backport) #12506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions okhttp/src/main/java/io/grpc/okhttp/OkHttpServerTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,13 +951,13 @@ public void settings(boolean clearPrevious, Settings settings) {

@Override
public void ping(boolean ack, int payload1, int payload2) {
if (!keepAliveEnforcer.pingAcceptable()) {
abruptShutdown(ErrorCode.ENHANCE_YOUR_CALM, "too_many_pings",
Status.RESOURCE_EXHAUSTED.withDescription("Too many pings from client"), false);
return;
}
long payload = (((long) payload1) << 32) | (payload2 & 0xffffffffL);
if (!ack) {
if (!keepAliveEnforcer.pingAcceptable()) {
abruptShutdown(ErrorCode.ENHANCE_YOUR_CALM, "too_many_pings",
Status.RESOURCE_EXHAUSTED.withDescription("Too many pings from client"), false);
return;
}
frameLogger.logPing(OkHttpFrameLogger.Direction.INBOUND, payload);
synchronized (lock) {
frameWriter.ping(true, payload1, payload2);
Expand Down
25 changes: 25 additions & 0 deletions okhttp/src/test/java/io/grpc/okhttp/OkHttpServerTransportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,31 @@ public void keepAliveEnforcer_noticesActive() throws Exception {
eq(ByteString.encodeString("too_many_pings", GrpcUtil.US_ASCII)));
}

@Test
public void keepAliveEnforcer_doesNotEnforcePingAcks() throws Exception {
serverBuilder.permitKeepAliveTime(1, TimeUnit.HOURS)
.permitKeepAliveWithoutCalls(true);
initTransport();
handshake();

for (int i = 0; i < KeepAliveEnforcer.MAX_PING_STRIKES + 2; i++) {
int serverPingId = 0xDEAD + i;
clientFrameWriter.ping(true, serverPingId, 0);
clientFrameWriter.flush();
}

for (int i = 0; i < KeepAliveEnforcer.MAX_PING_STRIKES; i++) {
pingPong();
}

pingPongId++;
clientFrameWriter.ping(false, pingPongId, 0);
clientFrameWriter.flush();
assertThat(clientFrameReader.nextFrame(clientFramesRead)).isTrue();
verify(clientFramesRead).goAway(0, ErrorCode.ENHANCE_YOUR_CALM,
ByteString.encodeString("too_many_pings", GrpcUtil.US_ASCII));
}

@Test
public void maxConcurrentCallsPerConnection_failsWithRst() throws Exception {
int maxConcurrentCallsPerConnection = 1;
Expand Down
Loading