From 4e085f03b71331c7cb4cc6a0be6f88f2257dd270 Mon Sep 17 00:00:00 2001 From: Alexander Reelsen Date: Wed, 14 Jun 2017 14:54:27 +0200 Subject: [PATCH] Tests: Disable watcher in ServerTransportFilterIntegrationTests These tests are starting their own nodes and do not use the testing trigger schedule class. There are occasional test failure due to a race condition where watcher is in the process of being started, but cannot be shut down properly, because starting up was not finished when the shut down was called for. These filter tests do not rely on watcher, so we can disable them for now, but we still need to fix a race condition in starting/stopping watcher. relates elastic/x-pack-elasticsearch#1422 Original commit: elastic/x-pack-elasticsearch@f13bb7a6fb99b5c5d4d8bc981f6c85dd9d505071 --- .../transport/ServerTransportFilterIntegrationTests.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugin/src/test/java/org/elasticsearch/xpack/security/transport/ServerTransportFilterIntegrationTests.java b/plugin/src/test/java/org/elasticsearch/xpack/security/transport/ServerTransportFilterIntegrationTests.java index 1d0f6fc667b..8350f6c58a1 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/security/transport/ServerTransportFilterIntegrationTests.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/security/transport/ServerTransportFilterIntegrationTests.java @@ -18,6 +18,7 @@ import org.elasticsearch.test.SecurityIntegTestCase; import org.elasticsearch.test.discovery.TestZenDiscovery; import org.elasticsearch.transport.Transport; import org.elasticsearch.xpack.XPackPlugin; +import org.elasticsearch.xpack.XPackSettings; import org.elasticsearch.xpack.security.Security; import org.elasticsearch.xpack.security.authc.file.FileRealm; import org.elasticsearch.xpack.ssl.SSLClientAuth; @@ -72,6 +73,7 @@ public class ServerTransportFilterIntegrationTests extends SecurityIntegTestCase // make sure this is "localhost", no matter if ipv4 or ipv6, but be consistent .put("transport.profiles.client.bind_host", "localhost") .put("xpack.security.audit.enabled", false) + .put(XPackSettings.WATCHER_ENABLED.getKey(), false) .put(TestZenDiscovery.USE_MOCK_PINGS.getKey(), false) .build(); } @@ -96,6 +98,7 @@ public class ServerTransportFilterIntegrationTests extends SecurityIntegTestCase .put("discovery.zen.minimum_master_nodes", internalCluster().getInstance(Settings.class).get("discovery.zen.minimum_master_nodes")) .put("xpack.security.audit.enabled", false) + .put(XPackSettings.WATCHER_ENABLED.getKey(), false) .put("path.home", home) .put(NetworkModule.HTTP_ENABLED.getKey(), false) .put(Node.NODE_MASTER_SETTING.getKey(), false) @@ -133,6 +136,7 @@ public class ServerTransportFilterIntegrationTests extends SecurityIntegTestCase .put("discovery.zen.minimum_master_nodes", internalCluster().getInstance(Settings.class).get("discovery.zen.minimum_master_nodes")) .put("xpack.security.audit.enabled", false) + .put(XPackSettings.WATCHER_ENABLED.getKey(), false) .put(NetworkModule.HTTP_ENABLED.getKey(), false) .put("discovery.initial_state_timeout", "0s") .put("path.home", home)