Skip to content

netty: fix ENHANCE_YOUR_CALM debug data logging #6596

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 5 commits into from
Jan 13, 2020
Merged

netty: fix ENHANCE_YOUR_CALM debug data logging #6596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a52c06
netty: fix ENHANCE_YOUR_CALM debug data logging
akandybaev Jan 11, 2020
a5ee7cd
netty: removed unused import in test (fix codestyle)
akandybaev Jan 11, 2020
bcfdeea
check logRef.get() instead logRef in test
akandybaev Jan 11, 2020
f1986f8
Apply suggestions from code review (fix indentation)
akandybaev Jan 11, 2020
f568eff
remove emptyline
akandybaev Jan 13, 2020
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
2 changes: 1 addition & 1 deletion netty/src/main/java/io/grpc/netty/NettyClientHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ public void onGoAwayReceived(int lastStreamId, long errorCode, ByteBuf debugData
if (errorCode == Http2Error.ENHANCE_YOUR_CALM.code()) {
String data = new String(debugDataBytes, UTF_8);
logger.log(
Level.WARNING, "Received GOAWAY with ENHANCE_YOUR_CALM. Debug data: {1}", data);
Level.WARNING, "Received GOAWAY with ENHANCE_YOUR_CALM. Debug data: {0}", data);
if ("too_many_pings".equals(data)) {
tooManyPingsRunnable.run();
}
Expand Down
36 changes: 36 additions & 0 deletions netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,15 @@
import io.netty.handler.codec.http2.Http2Stream;
import io.netty.util.AsciiString;
import java.io.InputStream;
import java.text.MessageFormat;
import java.util.LinkedList;
import java.util.List;
import java.util.Queue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Handler;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
Expand Down Expand Up @@ -459,6 +464,37 @@ public void run() {
assertTrue(b.get());
}

@Test
public void receivedGoAway_enhanceYourCalmShouldLogDebugData() throws Exception {
final AtomicReference<LogRecord> logRef = new AtomicReference<>();
Handler handler = new Handler() {
@Override
public void publish(LogRecord record) {
logRef.set(record);
}

@Override
public void flush() {
}

@Override
public void close() throws SecurityException {
}
};
Logger logger = Logger.getLogger(NettyClientHandler.class.getName());
try {
logger.addHandler(handler);
enqueue(newCreateStreamCommand(grpcHeaders, streamTransportState));
channelRead(goAwayFrame(0, 11 /* Enhance your calm */,
Unpooled.copiedBuffer("this is a test", UTF_8)));
assertNotNull(logRef.get());
assertTrue(MessageFormat.format(logRef.get().getMessage(), logRef.get().getParameters())
.contains("Debug data: this is a test"));
} finally {
logger.removeHandler(handler);
}
}

@Test
public void cancelStreamShouldCreateAndThenFailBufferedStream() throws Exception {
receiveMaxConcurrentStreams(0);
Expand Down