Skip to content

Commit 67f0dfe

Browse files
authored
Used a shared repo path for all nodes of a given cluster (elastic#93006)
1 parent c24712b commit 67f0dfe

File tree

2 files changed

+8
-17
lines changed

2 files changed

+8
-17
lines changed

qa/smoke-test-multinode/src/yamlRestTest/java/org/elasticsearch/smoketest/SmokeTestMultiNodeClientYamlTestSuiteIT.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,20 @@
1818
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
1919
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
2020
import org.junit.ClassRule;
21-
import org.junit.rules.RuleChain;
22-
import org.junit.rules.TemporaryFolder;
23-
import org.junit.rules.TestRule;
2421

2522
@TimeoutSuite(millis = 40 * TimeUnits.MINUTE) // some of the windows test VMs are slow as hell
2623
public class SmokeTestMultiNodeClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
2724

28-
private static TemporaryFolder repoDirectory = new TemporaryFolder();
29-
30-
private static ElasticsearchCluster cluster = ElasticsearchCluster.local()
25+
@ClassRule
26+
public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
3127
.nodes(2)
3228
.module("mapper-extras")
3329
.module("ingest-common")
34-
.setting("path.repo", () -> repoDirectory.getRoot().getPath())
3530
// The first node does not have the ingest role so we're sure ingest requests are forwarded:
3631
.node(0, n -> n.setting("node.roles", "[master,data,ml,remote_cluster_client,transform]"))
3732
.feature(FeatureFlag.TIME_SERIES_MODE)
3833
.build();
3934

40-
@ClassRule
41-
// Ensure the shared repo dir is created before cluster start
42-
public static TestRule ruleChain = RuleChain.outerRule(repoDirectory).around(cluster);
43-
4435
public SmokeTestMultiNodeClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {
4536
super(testCandidate);
4637
}

test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/LocalClusterFactory.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public class Node {
7575
private final LocalNodeSpec spec;
7676
private final Path workingDir;
7777
private final Path distributionDir;
78-
private final Path snapshotsDir;
78+
private final Path repoDir;
7979
private final Path dataDir;
8080
private final Path logsDir;
8181
private final Path configDir;
@@ -89,7 +89,7 @@ public Node(LocalNodeSpec spec) {
8989
this.spec = spec;
9090
this.workingDir = baseWorkingDir.resolve(spec.getCluster().getName()).resolve(spec.getName());
9191
this.distributionDir = workingDir.resolve("distro"); // location of es distribution files, typically hard-linked
92-
this.snapshotsDir = workingDir.resolve("repo");
92+
this.repoDir = baseWorkingDir.resolve("repo");
9393
this.dataDir = workingDir.resolve("data");
9494
this.logsDir = workingDir.resolve("logs");
9595
this.configDir = workingDir.resolve("config");
@@ -204,7 +204,7 @@ private void initializeWorkingDirectory() {
204204
IOUtils.deleteWithRetry(distributionDir);
205205
IOUtils.syncWithCopy(distributionDescriptor.getDistributionDir(), distributionDir);
206206
}
207-
Files.createDirectories(snapshotsDir);
207+
Files.createDirectories(repoDir);
208208
Files.createDirectories(dataDir);
209209
Files.createDirectories(logsDir);
210210
Files.createDirectories(tempDir);
@@ -227,9 +227,9 @@ private void writeConfiguration() {
227227
try {
228228
// Write settings to elasticsearch.yml
229229
Map<String, String> finalSettings = new HashMap<>();
230-
finalSettings.put("path.repo", workingDir.resolve("repo").toString());
231-
finalSettings.put("path.data", workingDir.resolve("data").toString());
232-
finalSettings.put("path.logs", workingDir.resolve("logs").toString());
230+
finalSettings.put("path.repo", repoDir.toString());
231+
finalSettings.put("path.data", dataDir.toString());
232+
finalSettings.put("path.logs", logsDir.toString());
233233
finalSettings.putAll(spec.resolveSettings());
234234

235235
Files.writeString(

0 commit comments

Comments
 (0)