This is an automated email from the ASF dual-hosted git repository.
bharat pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 88ed1e0 HDDS-1934. TestSecureOzoneCluster may fail due to port
conflict (#1254)
88ed1e0 is described below
commit 88ed1e0bfd6652d1803ebae0b3e743316cc8d11e
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Fri Aug 9 06:38:31 2019 +0200
HDDS-1934. TestSecureOzoneCluster may fail due to port conflict (#1254)
---
.../test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
index 247c9d7..853b6a2 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
@@ -35,6 +35,7 @@ import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.SCMSecurityProtocol;
+import org.apache.hadoop.hdds.scm.HddsTestUtils;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.hdds.scm.ScmInfo;
import org.apache.hadoop.hdds.scm.client.HddsClientUtils;
@@ -271,7 +272,7 @@ public final class TestSecureOzoneCluster {
public void testSCMSecurityProtocol() throws Exception {
initSCM();
- scm = StorageContainerManager.createSCM(conf);
+ scm = HddsTestUtils.getScm(conf);
//Reads the SCM Info from SCM instance
try {
scm.start();
@@ -739,7 +740,7 @@ public final class TestSecureOzoneCluster {
initSCM();
try {
- scm = StorageContainerManager.createSCM(conf);
+ scm = HddsTestUtils.getScm(conf);
scm.start();
conf.setBoolean(OZONE_SECURITY_ENABLED_KEY, false);
OMStorage omStore = new OMStorage(conf);
@@ -785,7 +786,7 @@ public final class TestSecureOzoneCluster {
omLogs.clearOutput();
initSCM();
try {
- scm = StorageContainerManager.createSCM(conf);
+ scm = HddsTestUtils.getScm(conf);
scm.start();
OMStorage omStore = new OMStorage(conf);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
