Skip to content

Commit ce3e69a

Browse files
author
Andrey Ershov
committed
Test for log level
1 parent 737e7f8 commit ce3e69a

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

server/src/main/java/org/elasticsearch/cluster/coordination/JoinHelper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@ boolean isJoinPending() {
177177
return pendingOutgoingJoins.iterator().hasNext();
178178
}
179179

180-
private static class FailedJoinAttempt {
180+
// package-private for testing
181+
static class FailedJoinAttempt {
181182
private final DiscoveryNode destination;
182183
private final JoinRequest joinRequest;
183184
private final TransportException exception;

server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,16 @@
1818
*/
1919
package org.elasticsearch.cluster.coordination;
2020

21+
import org.apache.logging.log4j.Level;
2122
import org.elasticsearch.Version;
23+
import org.elasticsearch.cluster.NotMasterException;
2224
import org.elasticsearch.cluster.node.DiscoveryNode;
2325
import org.elasticsearch.common.settings.Settings;
2426
import org.elasticsearch.test.ESTestCase;
2527
import org.elasticsearch.test.transport.CapturingTransport;
2628
import org.elasticsearch.test.transport.CapturingTransport.CapturedRequest;
29+
import org.elasticsearch.transport.RemoteTransportException;
30+
import org.elasticsearch.transport.TransportException;
2731
import org.elasticsearch.transport.TransportResponse;
2832
import org.elasticsearch.transport.TransportService;
2933

@@ -32,6 +36,7 @@
3236

3337
import static org.elasticsearch.node.Node.NODE_NAME_SETTING;
3438
import static org.hamcrest.Matchers.equalTo;
39+
import static org.hamcrest.core.Is.is;
3540

3641
public class JoinHelperTests extends ESTestCase {
3742

@@ -107,4 +112,23 @@ public void testJoinDeduplication() {
107112
capturingTransport.handleRemoteError(capturedRequest2a.requestId, new CoordinationStateRejectedException("dummy"));
108113
assertFalse(joinHelper.isJoinPending());
109114
}
115+
116+
public void testFailedJoinAttemptLogLevel() {
117+
assertThat(JoinHelper.FailedJoinAttempt.getLogLevel(new TransportException("generic transport exception")), is(Level.INFO));
118+
119+
assertThat(JoinHelper.FailedJoinAttempt.getLogLevel(
120+
new RemoteTransportException("remote transport exception with generic cause", new Exception())), is(Level.INFO));
121+
122+
assertThat(JoinHelper.FailedJoinAttempt.getLogLevel(
123+
new RemoteTransportException("caused by CoordinationStateRejectedException",
124+
new CoordinationStateRejectedException("test"))), is(Level.DEBUG));
125+
126+
assertThat(JoinHelper.FailedJoinAttempt.getLogLevel(
127+
new RemoteTransportException("caused by FailedToCommitClusterStateException",
128+
new FailedToCommitClusterStateException("test"))), is(Level.DEBUG));
129+
130+
assertThat(JoinHelper.FailedJoinAttempt.getLogLevel(
131+
new RemoteTransportException("caused by NotMasterException",
132+
new NotMasterException("test"))), is(Level.DEBUG));
133+
}
110134
}

0 commit comments

Comments
 (0)