Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDDS-1934. TestSecureOzoneCluster may fail due to port conflict (#1254)

This commit is contained in:
Doroszlai, Attila 2019-08-09 06:38:31 +02:00 committed by Bharat Viswanadham
parent 91f41b7d88
commit 88ed1e0bfd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
View File

@ -35,6 +35,7 @@ import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.SCMSecurityProtocol; 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.ScmConfigKeys;
import org.apache.hadoop.hdds.scm.ScmInfo; import org.apache.hadoop.hdds.scm.ScmInfo;
import org.apache.hadoop.hdds.scm.client.HddsClientUtils; import org.apache.hadoop.hdds.scm.client.HddsClientUtils;
@ -271,7 +272,7 @@ public final class TestSecureOzoneCluster {
public void testSCMSecurityProtocol() throws Exception { public void testSCMSecurityProtocol() throws Exception {
initSCM(); initSCM();
scm = StorageContainerManager.createSCM(conf); scm = HddsTestUtils.getScm(conf);
//Reads the SCM Info from SCM instance //Reads the SCM Info from SCM instance
try { try {
scm.start(); scm.start();
@ -739,7 +740,7 @@ public final class TestSecureOzoneCluster {
initSCM(); initSCM();
try { try {
scm = StorageContainerManager.createSCM(conf); scm = HddsTestUtils.getScm(conf);
scm.start(); scm.start();
conf.setBoolean(OZONE_SECURITY_ENABLED_KEY, false); conf.setBoolean(OZONE_SECURITY_ENABLED_KEY, false);
OMStorage omStore = new OMStorage(conf); OMStorage omStore = new OMStorage(conf);
@ -785,7 +786,7 @@ public final class TestSecureOzoneCluster {
omLogs.clearOutput(); omLogs.clearOutput();
initSCM(); initSCM();
try { try {
scm = StorageContainerManager.createSCM(conf); scm = HddsTestUtils.getScm(conf);
scm.start(); scm.start();
OMStorage omStore = new OMStorage(conf); OMStorage omStore = new OMStorage(conf);