From 731feff48f9d2c4b65d4f87a88848d980b146d21 Mon Sep 17 00:00:00 2001 From: javanna Date: Tue, 2 Dec 2014 11:06:29 +0100 Subject: [PATCH] [TEST] restored `gateway: local` settings in ClusterDiscoveryConfiguration fork and clarify version assert Local gateway has been removed in core, but it's a master only change. If we don't set it to local in our settings, we end up using the none gateway and KnownActionsTests fails because the local gateway endpoint are not registered to core. Original commit: elastic/x-pack-elasticsearch@c3bc37df4b6d38596656424d1c8ecab00ee6f88d --- .../test/discovery/ClusterDiscoveryConfiguration.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/elasticsearch/test/discovery/ClusterDiscoveryConfiguration.java b/src/test/java/org/elasticsearch/test/discovery/ClusterDiscoveryConfiguration.java index 59ce729438b..10eb0ea1221 100644 --- a/src/test/java/org/elasticsearch/test/discovery/ClusterDiscoveryConfiguration.java +++ b/src/test/java/org/elasticsearch/test/discovery/ClusterDiscoveryConfiguration.java @@ -23,10 +23,12 @@ public class ClusterDiscoveryConfiguration extends SettingsSource { static { //see https://github.com/elasticsearch/elasticsearch/pull/8634 - assert Version.CURRENT.onOrBefore(Version.V_1_4_0) : "Remove this class as the required fixes should have been released with core"; + assert Version.CURRENT.onOrBefore(Version.V_1_4_0) : "Remove this class or bump the version, the required fixes will come with es core 1.5"; } - static Settings DEFAULT_NODE_SETTINGS = ImmutableSettings.settingsBuilder().put("discovery.type", "zen").build(); + static Settings DEFAULT_NODE_SETTINGS = ImmutableSettings.settingsBuilder() + //.put("gateway.type", "local") + .put("discovery.type", "zen").build(); final int numOfNodes; final Settings nodeSettings;