honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix NullPointer when message shortcircuited (#55945) 

Currently if we shortcircuit a message the breaker release is null since
there is nothing to be broken. However, the TcpTransportChannel
infrastructure still expects it. This commit resolves this issue be
returning a no-op breaker release.
This commit is contained in:
Tim Brooks 2020-04-29 10:11:39 -06:00 committed by GitHub
parent edd049f9cd
commit 9eb6736500
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/org/elasticsearch/transport/InboundMessage.java
View File

@ -87,7 +87,11 @@ public class InboundMessage implements Releasable {
public Releasable takeBreakerReleaseControl() { public Releasable takeBreakerReleaseControl() {
final Releasable toReturn = breakerRelease; final Releasable toReturn = breakerRelease;
breakerRelease = null; breakerRelease = null;
return toReturn; if (toReturn != null) {
return toReturn;
} else {
return () -> {};
}
} }
public StreamInput openOrGetStreamInput() throws IOException { public StreamInput openOrGetStreamInput() throws IOException {

1
server/src/test/java/org/elasticsearch/transport/InboundAggregatorTests.java
View File

@ -130,6 +130,7 @@ public class InboundAggregatorTests extends ESTestCase {
assertThat(aggregated, notNullValue()); assertThat(aggregated, notNullValue());
assertTrue(aggregated.isShortCircuit()); assertTrue(aggregated.isShortCircuit());
assertThat(aggregated.getException(), instanceOf(ActionNotFoundTransportException.class)); assertThat(aggregated.getException(), instanceOf(ActionNotFoundTransportException.class));
assertNotNull(aggregated.takeBreakerReleaseControl());
} }
public void testCircuitBreak() throws IOException { public void testCircuitBreak() throws IOException {