Skip to content

Commit 88cfcbb

Browse files
bizybotbizybot
authored
fix and enable repository-hdfs secure tests (#44044) (#44201)
Due to recent changes are done for converting `repository-hdfs` to test clusters (#41252), the `integTestSecure*` tasks did not depend on `secureHdfsFixture` which when running would fail as the fixture would not be available. This commit adds the dependency of the fixture to the task. The `secureHdfsFixture` is a `AntFixture` which is spawned a process. Internally it waits for 30 seconds for the resources to be made available. For my local machine, it took almost 45 seconds to be available so I have added the wait time as an input to the `AntFixture` defaults to 30 seconds and set it to 60 seconds in case of secure hdfs fixture. The integ test for secure hdfs was disabled for a long time and so the changes done in #42090 to fix the tests are also done in this commit.
1 parent 53de123 commit 88cfcbb

File tree

4 files changed

+59
-20
lines changed

4 files changed

+59
-20
lines changed

‎buildSrc/src/main/groovy/org/elasticsearch/gradle/test/AntFixture.groovy‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ public class AntFixture extends AntTask implements Fixture {
5858
@Input
5959
boolean useShell = false
6060

61+
@Input
62+
int maxWaitInSeconds = 30
63+
6164
/**
6265
* A flag to indicate whether the fixture should be run in the foreground, or spawned.
6366
* It is protected so subclasses can override (eg RunTask).
@@ -128,7 +131,7 @@ public class AntFixture extends AntTask implements Fixture {
128131

129132
String failedProp = "failed${name}"
130133
// first wait for resources, or the failure marker from the wrapper script
131-
ant.waitfor(maxwait: '30', maxwaitunit: 'second', checkevery: '500', checkeveryunit: 'millisecond', timeoutproperty: failedProp) {
134+
ant.waitfor(maxwait: maxWaitInSeconds, maxwaitunit: 'second', checkevery: '500', checkeveryunit: 'millisecond', timeoutproperty: failedProp) {
132135
or {
133136
resourceexists {
134137
file(file: failureMarker.toString())

‎plugins/repository-hdfs/build.gradle‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ for (String fixtureName : ['hdfsFixture', 'haHdfsFixture', 'secureHdfsFixture',
8181
dependsOn project.configurations.hdfsFixture, project(':test:fixtures:krb5kdc-fixture').tasks.postProcessFixture
8282
executable = new File(project.runtimeJavaHome, 'bin/java')
8383
env 'CLASSPATH', "${ -> project.configurations.hdfsFixture.asPath }"
84+
maxWaitInSeconds 60
8485
onlyIf { project(':test:fixtures:krb5kdc-fixture').buildFixture.enabled }
8586
waitCondition = { fixture, ant ->
8687
// the hdfs.MiniHDFS fixture writes the ports file when
8788
// it's ready, so we can just wait for the file to exist
8889
return fixture.portsFile.exists()
8990
}
90-
9191
final List<String> miniHDFSArgs = []
9292

9393
// If it's a secure fixture, then depend on Kerberos Fixture and principals + add the krb5conf to the JVM options
@@ -118,7 +118,7 @@ for (String fixtureName : ['hdfsFixture', 'haHdfsFixture', 'secureHdfsFixture',
118118
}
119119
}
120120

121-
Set disabledIntegTestTaskNames = ['integTestSecure', 'integTestSecureHa']
121+
Set disabledIntegTestTaskNames = []
122122

123123
for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSecureHa']) {
124124
task "${integTestTaskName}"(type: RestIntegTestTask) {
@@ -129,10 +129,35 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
129129
enabled = false;
130130
}
131131

132+
if (integTestTaskName.contains("Secure")) {
133+
if (integTestTaskName.contains("Ha")) {
134+
dependsOn secureHaHdfsFixture
135+
} else {
136+
dependsOn secureHdfsFixture
137+
}
138+
}
139+
132140
runner {
141+
if (integTestTaskName.contains("Ha")) {
142+
if (integTestTaskName.contains("Secure")) {
143+
Path path = buildDir.toPath()
144+
.resolve("fixtures")
145+
.resolve("secureHaHdfsFixture")
146+
.resolve("ports")
147+
nonInputProperties.systemProperty "test.hdfs-fixture.ports", path
148+
classpath += files(path)
149+
} else {
150+
Path path = buildDir.toPath()
151+
.resolve("fixtures")
152+
.resolve("haHdfsFixture")
153+
.resolve("ports")
154+
nonInputProperties.systemProperty "test.hdfs-fixture.ports", path
155+
classpath += files(path)
156+
}
157+
}
158+
133159
if (integTestTaskName.contains("Secure")) {
134160
if (disabledIntegTestTaskNames.contains(integTestTaskName) == false) {
135-
dependsOn secureHdfsFixture
136161
nonInputProperties.systemProperty "test.krb5.principal.es", "elasticsearch@${realm}"
137162
nonInputProperties.systemProperty "test.krb5.principal.hdfs", "hdfs/hdfs.build.elastic.co@${realm}"
138163
jvmArgs "-Djava.security.krb5.conf=${krb5conf}"

‎plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HaHdfsFailoverTestSuiteIT.java‎

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,6 @@
1919

2020
package org.elasticsearch.repositories.hdfs;
2121

22-
import java.io.IOException;
23-
import java.net.InetSocketAddress;
24-
import java.nio.file.Files;
25-
import java.nio.file.Path;
26-
import java.security.AccessController;
27-
import java.security.PrivilegedActionException;
28-
import java.security.PrivilegedExceptionAction;
29-
import java.util.ArrayList;
30-
import java.util.List;
31-
3222
import org.apache.hadoop.conf.Configuration;
3323
import org.apache.hadoop.ha.BadFencingConfigurationException;
3424
import org.apache.hadoop.ha.HAServiceProtocol;
@@ -46,6 +36,16 @@
4636
import org.elasticsearch.test.rest.ESRestTestCase;
4737
import org.junit.Assert;
4838

39+
import java.io.IOException;
40+
import java.net.InetSocketAddress;
41+
import java.nio.file.Files;
42+
import java.nio.file.Path;
43+
import java.security.AccessController;
44+
import java.security.PrivilegedActionException;
45+
import java.security.PrivilegedExceptionAction;
46+
import java.util.ArrayList;
47+
import java.util.List;
48+
4949
/**
5050
* Integration test that runs against an HA-Enabled HDFS instance
5151
*/
@@ -57,13 +57,24 @@ public void testHAFailoverWithRepository() throws Exception {
5757
String esKerberosPrincipal = System.getProperty("test.krb5.principal.es");
5858
String hdfsKerberosPrincipal = System.getProperty("test.krb5.principal.hdfs");
5959
String kerberosKeytabLocation = System.getProperty("test.krb5.keytab.hdfs");
60+
String ports = System.getProperty("test.hdfs-fixture.ports");
61+
String nn1Port = "10001";
62+
String nn2Port = "10002";
63+
if (ports.length() > 0) {
64+
final Path path = PathUtils.get(ports);
65+
final List<String> lines = AccessController.doPrivileged((PrivilegedExceptionAction<List<String>>) () -> {
66+
return Files.readAllLines(path);
67+
});
68+
nn1Port = lines.get(0);
69+
nn2Port = lines.get(1);
70+
}
6071
boolean securityEnabled = hdfsKerberosPrincipal != null;
6172

6273
Configuration hdfsConfiguration = new Configuration();
6374
hdfsConfiguration.set("dfs.nameservices", "ha-hdfs");
6475
hdfsConfiguration.set("dfs.ha.namenodes.ha-hdfs", "nn1,nn2");
65-
hdfsConfiguration.set("dfs.namenode.rpc-address.ha-hdfs.nn1", "localhost:10001");
66-
hdfsConfiguration.set("dfs.namenode.rpc-address.ha-hdfs.nn2", "localhost:10002");
76+
hdfsConfiguration.set("dfs.namenode.rpc-address.ha-hdfs.nn1", "localhost:" + nn1Port);
77+
hdfsConfiguration.set("dfs.namenode.rpc-address.ha-hdfs.nn2", "localhost:" + nn2Port);
6778
hdfsConfiguration.set(
6879
"dfs.client.failover.proxy.provider.ha-hdfs",
6980
"org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider"
@@ -110,8 +121,8 @@ public void testHAFailoverWithRepository() throws Exception {
110121
securityCredentials(securityEnabled, esKerberosPrincipal) +
111122
"\"conf.dfs.nameservices\": \"ha-hdfs\"," +
112123
"\"conf.dfs.ha.namenodes.ha-hdfs\": \"nn1,nn2\"," +
113-
"\"conf.dfs.namenode.rpc-address.ha-hdfs.nn1\": \"localhost:10001\"," +
114-
"\"conf.dfs.namenode.rpc-address.ha-hdfs.nn2\": \"localhost:10002\"," +
124+
"\"conf.dfs.namenode.rpc-address.ha-hdfs.nn1\": \"localhost:"+nn1Port+"\"," +
125+
"\"conf.dfs.namenode.rpc-address.ha-hdfs.nn2\": \"localhost:"+nn2Port+"\"," +
115126
"\"conf.dfs.client.failover.proxy.provider.ha-hdfs\": " +
116127
"\"org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider\"" +
117128
"}" +

‎test/fixtures/hdfs-fixture/src/main/java/hdfs/MiniHDFS.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ public static void main(String[] args) throws Exception {
109109
String haNameService = System.getProperty("ha-nameservice");
110110
boolean haEnabled = haNameService != null;
111111
if (haEnabled) {
112-
MiniDFSNNTopology.NNConf nn1 = new MiniDFSNNTopology.NNConf("nn1").setIpcPort(10001);
113-
MiniDFSNNTopology.NNConf nn2 = new MiniDFSNNTopology.NNConf("nn2").setIpcPort(10002);
112+
MiniDFSNNTopology.NNConf nn1 = new MiniDFSNNTopology.NNConf("nn1").setIpcPort(0);
113+
MiniDFSNNTopology.NNConf nn2 = new MiniDFSNNTopology.NNConf("nn2").setIpcPort(0);
114114
MiniDFSNNTopology.NSConf nameservice = new MiniDFSNNTopology.NSConf(haNameService).addNN(nn1).addNN(nn2);
115115
MiniDFSNNTopology namenodeTopology = new MiniDFSNNTopology().addNameservice(nameservice);
116116
builder.nnTopology(namenodeTopology);

0 commit comments

Comments
 (0)