Browse Source

Revert "Add more logging to investigate #41067"

This reverts commit 8a1a000da03ce20ee6ed7a657d9e393eca443d24.

Revert "Fix logger usage check"

This reverts commit 21a368d3563dad7c27b2958ea4a85f15b60a1a9f.
Yannick Welsch 6 years ago
parent
commit
a3c0bc6eff

+ 0 - 1
server/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java

@@ -176,7 +176,6 @@ final class RemoteClusterConnection implements TransportConnectionListener, Clos
     @Override
     public void onNodeDisconnected(DiscoveryNode node) {
         boolean remove = connectedNodes.remove(node);
-        logger.trace("node disconnected: {}, removed: {}", node, remove);
         if (remove && connectedNodes.size() < maxNumRemoteConnections) {
             // try to reconnect and fill up the slot of the disconnected node
             connectHandler.forceConnect();

+ 1 - 4
server/src/test/java/org/elasticsearch/transport/RemoteClusterServiceTests.java

@@ -34,7 +34,6 @@ import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.core.internal.io.IOUtils;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.test.VersionUtils;
-import org.elasticsearch.test.junit.annotations.TestLogging;
 import org.elasticsearch.test.transport.MockTransportService;
 import org.elasticsearch.threadpool.TestThreadPool;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -547,8 +546,7 @@ public class RemoteClusterServiceTests extends ESTestCase {
         return ActionListener.wrap(x -> latch.countDown(), x -> fail());
     }
 
-    @TestLogging("org.elasticsearch.transport:TRACE") // added for https://github.com/elastic/elasticsearch/issues/41067
-    public void testCollectNodes() throws Exception {
+    public void testCollectNodes() throws InterruptedException, IOException {
         final Settings settings = Settings.EMPTY;
         final List<DiscoveryNode> knownNodes_c1 = new CopyOnWriteArrayList<>();
         final List<DiscoveryNode> knownNodes_c2 = new CopyOnWriteArrayList<>();
@@ -667,7 +665,6 @@ public class RemoteClusterServiceTests extends ESTestCase {
                             new ActionListener<BiFunction<String, String, DiscoveryNode>>() {
                                 @Override
                                 public void onResponse(BiFunction<String, String, DiscoveryNode> stringStringDiscoveryNodeBiFunction) {
-                                    logger.warn("unexpected call", new Exception("just for the stack trace"));
                                     try {
                                         fail("should not be called");
                                     } finally {