honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests: update the disco node id seed on node restart

Browse Source 
To make sure the new node's id is changed.

Closes #14675
This commit is contained in:
Boaz Leskes 2015-11-11 10:19:41 +01:00
parent 18a75fb30c
commit eff82fdbcd
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/elasticsearch/discovery/DiscoveryService.java
View File

@ -39,6 +39,8 @@ import java.util.concurrent.TimeUnit;
public class DiscoveryService extends AbstractLifecycleComponent<DiscoveryService> { public class DiscoveryService extends AbstractLifecycleComponent<DiscoveryService> {
public static final String SETTING_INITIAL_STATE_TIMEOUT = "discovery.initial_state_timeout"; public static final String SETTING_INITIAL_STATE_TIMEOUT = "discovery.initial_state_timeout";
public static final String SETTING_DISCOVERY_SEED = "discovery.id.seed";
private static class InitialStateListener implements InitialStateDiscoveryListener { private static class InitialStateListener implements InitialStateDiscoveryListener {
@ -130,7 +132,7 @@ public class DiscoveryService extends AbstractLifecycleComponent<DiscoveryServic
} }
public static String generateNodeId(Settings settings) { public static String generateNodeId(Settings settings) {
String seed = settings.get("discovery.id.seed"); String seed = settings.get(DiscoveryService.SETTING_DISCOVERY_SEED);
if (seed != null) { if (seed != null) {
return Strings.randomBase64UUID(new Random(Long.parseLong(seed))); return Strings.randomBase64UUID(new Random(Long.parseLong(seed)));
} }

6
test-framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
View File

@ -60,6 +60,7 @@ import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.discovery.DiscoveryService;
import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.env.NodeEnvironment;
import org.elasticsearch.http.HttpServerTransport; import org.elasticsearch.http.HttpServerTransport;
import org.elasticsearch.index.IndexModule; import org.elasticsearch.index.IndexModule;
@ -595,7 +596,7 @@ public final class InternalTestCluster extends TestCluster {
.put("path.home", baseDir) // allow overriding path.home .put("path.home", baseDir) // allow overriding path.home
.put(settings) .put(settings)
.put("name", name) .put("name", name)
.put("discovery.id.seed", seed) .put(DiscoveryService.SETTING_DISCOVERY_SEED, seed)
.build(); .build();
MockNode node = new MockNode(finalSettings, version, plugins); MockNode node = new MockNode(finalSettings, version, plugins);
return new NodeAndClient(name, node); return new NodeAndClient(name, node);
@ -842,7 +843,8 @@ public final class InternalTestCluster extends TestCluster {
IOUtils.rm(nodeEnv.nodeDataPaths()); IOUtils.rm(nodeEnv.nodeDataPaths());
} }
} }
Settings finalSettings = Settings.builder().put(node.settings()).put(newSettings).build(); final long newIdSeed = node.settings().getAsLong(DiscoveryService.SETTING_DISCOVERY_SEED, 0l) + 1; // use a new seed to make sure we have new node id
Settings finalSettings = Settings.builder().put(node.settings()).put(newSettings).put(DiscoveryService.SETTING_DISCOVERY_SEED, newIdSeed).build();
Collection<Class<? extends Plugin>> plugins = node.getPlugins(); Collection<Class<? extends Plugin>> plugins = node.getPlugins();
Version version = node.getVersion(); Version version = node.getVersion();
node = new MockNode(finalSettings, version, plugins); node = new MockNode(finalSettings, version, plugins);