http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java index 5885898..4a6ca1d 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java @@ -19,11 +19,9 @@ package org.apache.hadoop.ozone.container.ozoneimpl; import org.apache.hadoop.hdds.protocol.proto.ContainerProtos; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.container.ContainerTestHelper; import org.apache.hadoop.hdds.scm.TestUtils; import org.apache.hadoop.ozone.web.utils.OzoneUtils; @@ -59,8 +57,8 @@ public class TestOzoneContainer { OzoneContainer container = null; MiniOzoneCluster cluster = null; try { - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + cluster = MiniOzoneCluster.newBuilder(conf).build(); + cluster.waitForClusterToBeReady(); // We don't start Ozone Container via data node, we will do it // independently in our test path. Pipeline pipeline = ContainerTestHelper.createSingleNodePipeline( @@ -105,9 +103,10 @@ public class TestOzoneContainer { conf.setInt(OzoneConfigKeys.DFS_CONTAINER_IPC_PORT, pipeline.getLeader().getContainerPort()); - cluster = new MiniOzoneClassicCluster.Builder(conf) + cluster = MiniOzoneCluster.newBuilder(conf) .setRandomContainerPort(false) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + .build(); + cluster.waitForClusterToBeReady(); // This client talks to ozone container via datanode. XceiverClient client = new XceiverClient(pipeline, conf); @@ -208,9 +207,10 @@ public class TestOzoneContainer { OzoneConfiguration conf = newOzoneConfiguration(); client = createClientForTesting(conf); - cluster = new MiniOzoneClassicCluster.Builder(conf) + cluster = MiniOzoneCluster.newBuilder(conf) .setRandomContainerPort(false) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + .build(); + cluster.waitForClusterToBeReady(); String containerName = client.getPipeline().getContainerName(); runTestBothGetandPutSmallFile(containerName, client); @@ -266,9 +266,10 @@ public class TestOzoneContainer { OzoneConfiguration conf = newOzoneConfiguration(); client = createClientForTesting(conf); - cluster = new MiniOzoneClassicCluster.Builder(conf) + cluster = MiniOzoneCluster.newBuilder(conf) .setRandomContainerPort(false) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + .build(); + cluster.waitForClusterToBeReady(); client.connect(); String containerName = client.getPipeline().getContainerName(); @@ -356,9 +357,10 @@ public class TestOzoneContainer { OzoneConfiguration conf = newOzoneConfiguration(); client = createClientForTesting(conf); - cluster = new MiniOzoneClassicCluster.Builder(conf) + cluster = MiniOzoneCluster.newBuilder(conf) .setRandomContainerPort(false) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + .build(); + cluster.waitForClusterToBeReady(); client.connect(); String containerName = client.getPipeline().getContainerName(); @@ -471,9 +473,10 @@ public class TestOzoneContainer { OzoneConfiguration conf = newOzoneConfiguration(); client = createClientForTesting(conf); - cluster = new MiniOzoneClassicCluster.Builder(conf) + cluster = MiniOzoneCluster.newBuilder(conf) .setRandomContainerPort(false) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + .build(); + cluster.waitForClusterToBeReady(); String containerName = client.getPipeline().getContainerName(); runAsyncTests(containerName, client); } finally { @@ -492,9 +495,10 @@ public class TestOzoneContainer { OzoneConfiguration conf = newOzoneConfiguration(); client = createClientForTesting(conf); - cluster = new MiniOzoneClassicCluster.Builder(conf) + cluster = MiniOzoneCluster.newBuilder(conf) .setRandomContainerPort(false) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + .build(); + cluster.waitForClusterToBeReady(); client.connect(); // Send a request without traceId.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainerRatis.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainerRatis.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainerRatis.java index 8ecfe3f..9c10b28 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainerRatis.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainerRatis.java @@ -18,11 +18,9 @@ package org.apache.hadoop.ozone.container.ozoneimpl; -import org.apache.hadoop.hdfs.server.datanode.DataNode; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; +import org.apache.hadoop.ozone.HddsDatanodeService; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.MiniOzoneTestHelper; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.RatisTestHelper; import org.apache.hadoop.ozone.container.ContainerTestHelper; import org.apache.hadoop.ozone.web.utils.OzoneUtils; @@ -76,20 +74,19 @@ public class TestOzoneContainerRatis { // create Ozone clusters final OzoneConfiguration conf = newOzoneConfiguration(); RatisTestHelper.initRatisConf(rpc, conf); - final MiniOzoneClassicCluster cluster = - new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_LOCAL) - .numDataNodes(numNodes) + final MiniOzoneCluster cluster = + MiniOzoneCluster.newBuilder(conf) + .setNumDatanodes(numNodes) .build(); try { - cluster.waitOzoneReady(); + cluster.waitForClusterToBeReady(); final String containerName = OzoneUtils.getRequestID(); - final List<DataNode> datanodes = cluster.getDataNodes(); + final List<HddsDatanodeService> datanodes = cluster.getHddsDatanodes(); final Pipeline pipeline = ContainerTestHelper.createPipeline( containerName, CollectionUtils.as(datanodes, - MiniOzoneTestHelper::getDatanodeDetails)); + HddsDatanodeService::getDatanodeDetails)); LOG.info("pipeline=" + pipeline); // Create Ratis cluster http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestRatisManager.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestRatisManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestRatisManager.java index 03ef999..12c2b7b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestRatisManager.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestRatisManager.java @@ -18,12 +18,10 @@ package org.apache.hadoop.ozone.container.ozoneimpl; -import org.apache.hadoop.hdfs.server.datanode.DataNode; import org.apache.hadoop.hdds.protocol.DatanodeDetails; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; +import org.apache.hadoop.ozone.HddsDatanodeService; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.MiniOzoneTestHelper; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.RatisTestHelper; import org.apache.hadoop.ozone.container.ContainerTestHelper; import org.apache.ratis.rpc.RpcType; @@ -75,17 +73,15 @@ public class TestRatisManager { // create Ozone clusters final OzoneConfiguration conf = newOzoneConfiguration(); RatisTestHelper.initRatisConf(rpc, conf); - final MiniOzoneClassicCluster cluster = - new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_LOCAL) - .numDataNodes(5) + final MiniOzoneCluster cluster = MiniOzoneCluster.newBuilder(conf) + .setNumDatanodes(5) .build(); try { - cluster.waitOzoneReady(); + cluster.waitForClusterToBeReady(); - final List<DataNode> datanodes = cluster.getDataNodes(); + final List<HddsDatanodeService> datanodes = cluster.getHddsDatanodes(); final List<DatanodeDetails> datanodeDetailsSet = datanodes.stream() - .map(MiniOzoneTestHelper::getDatanodeDetails).collect( + .map(HddsDatanodeService::getDatanodeDetails).collect( Collectors.toList()); //final RatisManager manager = RatisManager.newRatisManager(conf); http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidate.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidate.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidate.java index 296a616..8b8072c 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidate.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestDataValidate.java @@ -19,7 +19,6 @@ package org.apache.hadoop.ozone.freon; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.OzoneConsts; @@ -56,9 +55,9 @@ public class TestDataValidate { conf = new OzoneConfiguration(); conf.set(OzoneConfigKeys.OZONE_HANDLER_TYPE_KEY, OzoneConsts.OZONE_HANDLER_DISTRIBUTED); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED) - .numDataNodes(5).build(); + cluster = MiniOzoneCluster.newBuilder(conf) + .setNumDatanodes(5).build(); + cluster.waitForClusterToBeReady(); } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreon.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreon.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreon.java index 4403010..203cf4d 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreon.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreon.java @@ -18,11 +18,8 @@ package org.apache.hadoop.ozone.freon; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.util.ToolRunner; import org.junit.AfterClass; import org.junit.Assert; @@ -52,11 +49,8 @@ public class TestFreon { @BeforeClass public static void init() throws Exception { conf = new OzoneConfiguration(); - conf.set(OzoneConfigKeys.OZONE_HANDLER_TYPE_KEY, - OzoneConsts.OZONE_HANDLER_DISTRIBUTED); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED) - .numDataNodes(5).build(); + cluster = MiniOzoneCluster.newBuilder(conf).setNumDatanodes(5).build(); + cluster.waitForClusterToBeReady(); } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestContainerReportWithKeys.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestContainerReportWithKeys.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestContainerReportWithKeys.java index 920f5c8..ccfa180 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestContainerReportWithKeys.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestContainerReportWithKeys.java @@ -22,8 +22,7 @@ import org.apache.hadoop.hdds.client.ReplicationFactor; import org.apache.hadoop.hdds.client.ReplicationType; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.proto.HddsProtos; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; -import org.apache.hadoop.ozone.MiniOzoneTestHelper; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.client.*; @@ -51,7 +50,7 @@ import java.io.IOException; public class TestContainerReportWithKeys { private static final Logger LOG = LoggerFactory.getLogger( TestContainerReportWithKeys.class); - private static MiniOzoneClassicCluster cluster = null; + private static MiniOzoneCluster cluster = null; private static OzoneConfiguration conf; private static StorageContainerManager scm; @@ -71,8 +70,8 @@ public class TestContainerReportWithKeys { conf = new OzoneConfiguration(); conf.set(OzoneConfigKeys.OZONE_HANDLER_TYPE_KEY, OzoneConsts.OZONE_HANDLER_DISTRIBUTED); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + cluster = MiniOzoneCluster.newBuilder(conf).build(); + cluster.waitForClusterToBeReady(); scm = cluster.getStorageContainerManager(); } @@ -117,7 +116,7 @@ public class TestContainerReportWithKeys { cluster.getKeySpaceManager().lookupKey(keyArgs).getKeyLocationVersions() .get(0).getBlocksLatestVersionOnly().get(0); - ContainerData cd = getContainerData(cluster, keyInfo.getContainerName()); + ContainerData cd = getContainerData(keyInfo.getContainerName()); LOG.info("DN Container Data: keyCount: {} used: {} ", cd.getKeyCount(), cd.getBytesUsed()); @@ -129,12 +128,11 @@ public class TestContainerReportWithKeys { } - private static ContainerData getContainerData(MiniOzoneClassicCluster clus, - String containerName) { - ContainerData containerData = null; + private static ContainerData getContainerData(String containerName) { + ContainerData containerData; try { - ContainerManager containerManager = MiniOzoneTestHelper - .getOzoneContainerManager(clus.getDataNodes().get(0)); + ContainerManager containerManager = cluster.getHddsDatanodes().get(0) + .getDatanodeStateMachine().getContainer().getContainerManager(); containerData = containerManager.readContainer(containerName); } catch (StorageContainerException e) { throw new AssertionError(e); http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKSMMetrcis.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKSMMetrcis.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKSMMetrcis.java index ae50c03..60d690f 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKSMMetrcis.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKSMMetrcis.java @@ -22,7 +22,6 @@ import static org.apache.hadoop.test.MetricsAsserts.getMetrics; import java.io.IOException; import org.apache.hadoop.metrics2.MetricsRecordBuilder; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; @@ -55,8 +54,8 @@ public class TestKSMMetrcis { OzoneConfiguration conf = new OzoneConfiguration(); conf.set(OzoneConfigKeys.OZONE_HANDLER_TYPE_KEY, OzoneConsts.OZONE_HANDLER_DISTRIBUTED); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + cluster = MiniOzoneCluster.newBuilder(conf).build(); + cluster.waitForClusterToBeReady(); ksmManager = cluster.getKeySpaceManager(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKSMSQLCli.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKSMSQLCli.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKSMSQLCli.java index daf1fa7..7b92ec7 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKSMSQLCli.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKSMSQLCli.java @@ -17,7 +17,7 @@ package org.apache.hadoop.ozone.ksm; import org.apache.hadoop.hdfs.server.datanode.ObjectStoreHandler; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.ozone.OzoneConsts; @@ -28,6 +28,8 @@ import org.apache.hadoop.ozone.web.handlers.UserArgs; import org.apache.hadoop.ozone.web.handlers.VolumeArgs; import org.apache.hadoop.ozone.web.interfaces.StorageHandler; import org.apache.hadoop.ozone.web.utils.OzoneUtils; +import org.apache.hadoop.test.GenericTestUtils; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,6 +49,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import java.util.UUID; import static org.apache.hadoop.ozone.OzoneConsts.KSM_DB_NAME; import static org.junit.Assert.assertEquals; @@ -59,7 +62,7 @@ import static org.junit.Assert.assertTrue; */ @RunWith(Parameterized.class) public class TestKSMSQLCli { - private MiniOzoneClassicCluster cluster = null; + private MiniOzoneCluster cluster = null; private StorageHandler storageHandler; private UserArgs userArgs; private OzoneConfiguration conf; @@ -104,12 +107,12 @@ public class TestKSMSQLCli { conf = new OzoneConfiguration(); conf.set(OzoneConfigKeys.OZONE_HANDLER_TYPE_KEY, OzoneConsts.OZONE_HANDLER_DISTRIBUTED); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + cluster = MiniOzoneCluster.newBuilder(conf).build(); + cluster.waitForClusterToBeReady(); storageHandler = new ObjectStoreHandler(conf).getStorageHandler(); userArgs = new UserArgs(null, OzoneUtils.getRequestID(), null, null, null, null); - cluster.waitForHeartbeatProcessed(); + cluster.waitForClusterToBeReady(); VolumeArgs createVolumeArgs0 = new VolumeArgs(volumeName0, userArgs); createVolumeArgs0.setUserName(userName); @@ -149,15 +152,23 @@ public class TestKSMSQLCli { stream = storageHandler.newKeyWriter(keyArgs3); stream.close(); - cluster.shutdown(); - + cluster.getKeySpaceManager().stop(); + cluster.getStorageContainerManager().stop(); conf.set(OzoneConfigKeys.OZONE_METADATA_STORE_IMPL, metaStoreType); cli = new SQLCLI(conf); } + @After + public void shutdown() { + if (cluster != null) { + cluster.shutdown(); + } + } + @Test public void testKSMDB() throws Exception { - String dbOutPath = cluster.getDataDirectory() + "/out_sql.db"; + String dbOutPath = GenericTestUtils.getTempPath( + UUID.randomUUID() + "/out_sql.db"); String dbRootPath = conf.get(OzoneConfigKeys.OZONE_METADATA_DIRS); String dbPath = dbRootPath + "/" + KSM_DB_NAME; http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKeySpaceManager.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKeySpaceManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKeySpaceManager.java index ce40948..a37f005 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKeySpaceManager.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKeySpaceManager.java @@ -22,7 +22,6 @@ import org.apache.hadoop.fs.StorageType; import org.apache.hadoop.hdfs.DFSUtil; import org.apache.hadoop.hdfs.server.datanode.ObjectStoreHandler; import org.apache.hadoop.net.NetUtils; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; @@ -123,12 +122,12 @@ public class TestKeySpaceManager { conf.set(OzoneConfigKeys.OZONE_HANDLER_TYPE_KEY, OzoneConsts.OZONE_HANDLER_DISTRIBUTED); conf.setInt(OZONE_OPEN_KEY_EXPIRE_THRESHOLD_SECONDS, 2); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED) + cluster = MiniOzoneCluster.newBuilder(conf) .setClusterId(clusterId) .setScmId(scmId) .setKsmId(ksmId) .build(); + cluster.waitForClusterToBeReady(); storageHandler = new ObjectStoreHandler(conf).getStorageHandler(); userArgs = new UserArgs(null, OzoneUtils.getRequestID(), null, null, null, null); http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKeySpaceManagerRestInterface.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKeySpaceManagerRestInterface.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKeySpaceManagerRestInterface.java index a9bad62..2fb70f9 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKeySpaceManagerRestInterface.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKeySpaceManagerRestInterface.java @@ -21,12 +21,9 @@ package org.apache.hadoop.ozone.ksm; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.type.TypeReference; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.hdfs.server.datanode.DataNode; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.net.NetUtils; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.MiniOzoneTestHelper; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.ksm.helpers.ServiceInfo; import org.apache.hadoop.ozone.protocol.proto .KeySpaceManagerProtocolProtos.ServicePort; @@ -45,7 +42,6 @@ import java.net.InetSocketAddress; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.UUID; import static org.apache.hadoop.hdds.HddsUtils.getScmAddressForClients; import static org.apache.hadoop.ozone.KsmUtils.getKsmAddressForClients; @@ -61,17 +57,14 @@ public class TestKeySpaceManagerRestInterface { @BeforeClass public static void setUp() throws Exception { conf = new OzoneConfiguration(); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED) - .setClusterId(UUID.randomUUID().toString()) - .setScmId(UUID.randomUUID().toString()) - .build(); + cluster = MiniOzoneCluster.newBuilder(conf).build(); + cluster.waitForClusterToBeReady(); } @AfterClass public static void tearDown() throws Exception { if (cluster != null) { - cluster.close(); + cluster.shutdown(); } } @@ -115,9 +108,9 @@ public class TestKeySpaceManagerRestInterface { scmInfo.getPort(ServicePort.Type.RPC)); ServiceInfo datanodeInfo = serviceMap.get(HddsProtos.NodeType.DATANODE); - DataNode datanode = ((MiniOzoneClassicCluster) cluster) - .getDataNodes().get(0); - Assert.assertEquals(datanode.getDatanodeHostname(), + DatanodeDetails datanodeDetails = cluster.getHddsDatanodes().get(0) + .getDatanodeDetails(); + Assert.assertEquals(datanodeDetails.getHostName(), datanodeInfo.getHostname()); Map<ServicePort.Type, Integer> ports = datanodeInfo.getPorts(); @@ -125,7 +118,7 @@ public class TestKeySpaceManagerRestInterface { switch (type) { case HTTP: case HTTPS: - Assert.assertEquals(MiniOzoneTestHelper.getOzoneRestPort(datanode), + Assert.assertEquals(datanodeDetails.getOzoneRestPort(), (int) ports.get(type)); break; default: http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKsmBlockVersioning.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKsmBlockVersioning.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKsmBlockVersioning.java index 01d2b1d..34bbaf6 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKsmBlockVersioning.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestKsmBlockVersioning.java @@ -21,7 +21,6 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.fs.StorageType; import org.apache.hadoop.hdfs.DFSUtil; import org.apache.hadoop.hdfs.server.datanode.ObjectStoreHandler; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.OzoneConsts; @@ -77,8 +76,8 @@ public class TestKsmBlockVersioning { conf = new OzoneConfiguration(); conf.set(OzoneConfigKeys.OZONE_HANDLER_TYPE_KEY, OzoneConsts.OZONE_HANDLER_DISTRIBUTED); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + cluster = MiniOzoneCluster.newBuilder(conf).build(); + cluster.waitForClusterToBeReady(); storageHandler = new ObjectStoreHandler(conf).getStorageHandler(); userArgs = new UserArgs(null, OzoneUtils.getRequestID(), null, null, null, null); http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestMultipleContainerReadWrite.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestMultipleContainerReadWrite.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestMultipleContainerReadWrite.java index d895765..765ec3f 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestMultipleContainerReadWrite.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ksm/TestMultipleContainerReadWrite.java @@ -20,7 +20,6 @@ import org.apache.commons.lang.RandomStringUtils; import org.apache.hadoop.fs.StorageType; import org.apache.hadoop.hdfs.server.datanode.ObjectStoreHandler; import org.apache.hadoop.metrics2.MetricsRecordBuilder; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; @@ -76,8 +75,8 @@ public class TestMultipleContainerReadWrite { conf.setInt(ScmConfigKeys.OZONE_SCM_CONTAINER_PROVISION_BATCH_SIZE, 5); conf.set(OzoneConfigKeys.OZONE_HANDLER_TYPE_KEY, OzoneConsts.OZONE_HANDLER_DISTRIBUTED); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + cluster = MiniOzoneCluster.newBuilder(conf).build(); + cluster.waitForClusterToBeReady(); storageHandler = new ObjectStoreHandler(conf).getStorageHandler(); userArgs = new UserArgs(null, OzoneUtils.getRequestID(), null, null, null, null); http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestOzoneShell.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestOzoneShell.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestOzoneShell.java index eeb10fd..31046f5 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestOzoneShell.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestOzoneShell.java @@ -26,9 +26,7 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.IOException; import java.io.PrintStream; -import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -38,9 +36,7 @@ import java.util.UUID; import org.apache.commons.lang.RandomStringUtils; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.hdfs.DFSUtil; -import org.apache.hadoop.hdfs.server.datanode.DataNode; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; -import org.apache.hadoop.ozone.MiniOzoneTestHelper; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneAcl; import org.apache.hadoop.ozone.OzoneAcl.OzoneACLRights; import org.apache.hadoop.ozone.OzoneAcl.OzoneACLType; @@ -82,7 +78,7 @@ public class TestOzoneShell { private static String url; private static File baseDir; private static OzoneConfiguration conf = null; - private static MiniOzoneClassicCluster cluster = null; + private static MiniOzoneCluster cluster = null; private static OzoneRestClient client = null; private static Shell shell = null; @@ -95,11 +91,10 @@ public class TestOzoneShell { * Create a MiniDFSCluster for testing with using distributed Ozone * handler type. * - * @throws IOException + * @throws Exception */ @BeforeClass - public static void init() - throws IOException, URISyntaxException, OzoneException { + public static void init() throws Exception { conf = new OzoneConfiguration(); String path = GenericTestUtils.getTempPath( @@ -115,10 +110,10 @@ public class TestOzoneShell { shell = new Shell(); shell.setConf(conf); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); - DataNode dataNode = cluster.getDataNodes().get(0); - final int port = MiniOzoneTestHelper.getOzoneRestPort(dataNode); + cluster = MiniOzoneCluster.newBuilder(conf).build(); + cluster.waitForClusterToBeReady(); + final int port = cluster.getHddsDatanodes().get(0).getDatanodeDetails() + .getOzoneRestPort(); url = String.format("http://localhost:%d";, port); client = new OzoneRestClient(String.format("http://localhost:%d";, port)); client.setUserAuth(OzoneConsts.OZONE_SIMPLE_HDFS_USER); http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java index 020fecd..275fadb 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestAllocateContainer.java @@ -19,10 +19,8 @@ package org.apache.hadoop.ozone.scm; import org.apache.commons.lang.RandomStringUtils; import org.apache.hadoop.io.IOUtils; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.hdds.scm.XceiverClientManager; import org.apache.hadoop.hdds.scm.protocolPB.StorageContainerLocationProtocolClientSideTranslatorPB; import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline; @@ -51,15 +49,12 @@ public class TestAllocateContainer { @BeforeClass public static void init() throws Exception { - long datanodeCapacities = 3 * OzoneConsts.TB; conf = new OzoneConfiguration(); - cluster = new MiniOzoneClassicCluster.Builder(conf).numDataNodes(3) - .storageCapacities(new long[] {datanodeCapacities, datanodeCapacities}) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + cluster = MiniOzoneCluster.newBuilder(conf).setNumDatanodes(3).build(); + cluster.waitForClusterToBeReady(); storageContainerLocationClient = - cluster.createStorageContainerLocationClient(); + cluster.getStorageContainerLocationClient(); xceiverClientManager = new XceiverClientManager(conf); - cluster.waitForHeartbeatProcessed(); } @AfterClass @@ -67,7 +62,7 @@ public class TestAllocateContainer { if(cluster != null) { cluster.shutdown(); } - IOUtils.cleanupWithLogger(null, storageContainerLocationClient, cluster); + IOUtils.cleanupWithLogger(null, storageContainerLocationClient); } @Test http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java index 7ec43e3..3deb050 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java @@ -19,22 +19,19 @@ package org.apache.hadoop.ozone.scm; import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.hdds.scm.node.NodeManager; -import org.apache.hadoop.io.IOUtils; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.hdds.scm.block.BlockManagerImpl; import org.apache.hadoop.hdds.scm.container.ContainerMapping; import org.apache.hadoop.hdds.scm.container.placement.algorithms.ContainerPlacementPolicy; import org.apache.hadoop.hdds.scm.container.placement.algorithms.SCMContainerPlacementCapacity; -import org.apache.hadoop.hdds.scm.node.NodeManager; import org.apache.hadoop.hdds.scm.ScmConfigKeys; import org.apache.hadoop.hdds.scm.container.common.helpers.AllocatedBlock; import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline; -import org.apache.hadoop.hdds.scm.protocolPB.StorageContainerLocationProtocolClientSideTranslatorPB; import org.apache.hadoop.ozone.scm.cli.SQLCLI; +import org.apache.hadoop.test.GenericTestUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -52,12 +49,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; +import java.util.UUID; import static org.apache.hadoop.ozone.OzoneConsts.BLOCK_DB; import static org.apache.hadoop.ozone.OzoneConsts.SCM_CONTAINER_DB; import static org.apache.hadoop.ozone.OzoneConsts.KB; import static org.apache.hadoop.ozone.OzoneConsts.NODEPOOL_DB; -//import static org.apache.hadoop.ozone.OzoneConsts.OPEN_CONTAINERS_DB; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -83,10 +80,9 @@ public class TestContainerSQLCli { private static SQLCLI cli; - private MiniOzoneClassicCluster cluster; + private MiniOzoneCluster cluster; private OzoneConfiguration conf; - private StorageContainerLocationProtocolClientSideTranslatorPB - storageContainerLocationClient; + private String datanodeIpAddress; private ContainerMapping mapping; private NodeManager nodeManager; @@ -105,7 +101,6 @@ public class TestContainerSQLCli { @Before public void setup() throws Exception { - long datanodeCapacities = 3 * OzoneConsts.TB; blockContainerMap = new HashMap<>(); conf = new OzoneConfiguration(); @@ -120,13 +115,12 @@ public class TestContainerSQLCli { factor = HddsProtos.ReplicationFactor.ONE; type = HddsProtos.ReplicationType.STAND_ALONE; } - cluster = new MiniOzoneClassicCluster.Builder(conf).numDataNodes(2) - .storageCapacities(new long[] {datanodeCapacities, datanodeCapacities}) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); - storageContainerLocationClient = - cluster.createStorageContainerLocationClient(); - cluster.waitForHeartbeatProcessed(); - cluster.shutdown(); + cluster = MiniOzoneCluster.newBuilder(conf).setNumDatanodes(2).build(); + cluster.waitForClusterToBeReady(); + datanodeIpAddress = cluster.getHddsDatanodes().get(0) + .getDatanodeDetails().getIpAddress(); + cluster.getKeySpaceManager().stop(); + cluster.getStorageContainerManager().stop(); nodeManager = cluster.getStorageContainerManager().getScmNodeManager(); mapping = new ContainerMapping(conf, nodeManager, 128); @@ -179,12 +173,15 @@ public class TestContainerSQLCli { @After public void shutdown() throws InterruptedException { - IOUtils.cleanupWithLogger(null, storageContainerLocationClient, cluster); + if (cluster != null) { + cluster.shutdown(); + } } @Test public void testConvertBlockDB() throws Exception { - String dbOutPath = cluster.getDataDirectory() + "/out_sql.db"; + String dbOutPath = GenericTestUtils.getTempPath( + UUID.randomUUID() + "/out_sql.db"); String dbRootPath = conf.get(OzoneConfigKeys.OZONE_METADATA_DIRS); String dbPath = dbRootPath + "/" + BLOCK_DB; String[] args = {"-p", dbPath, "-o", dbOutPath}; @@ -206,7 +203,8 @@ public class TestContainerSQLCli { @Test public void testConvertNodepoolDB() throws Exception { - String dbOutPath = cluster.getDataDirectory() + "/out_sql.db"; + String dbOutPath = GenericTestUtils.getTempPath( + UUID.randomUUID() + "/out_sql.db"); String dbRootPath = conf.get(OzoneConfigKeys.OZONE_METADATA_DIRS); String dbPath = dbRootPath + "/" + NODEPOOL_DB; String[] args = {"-p", dbPath, "-o", dbOutPath}; @@ -233,7 +231,8 @@ public class TestContainerSQLCli { @Test public void testConvertContainerDB() throws Exception { - String dbOutPath = cluster.getDataDirectory() + "/out_sql.db"; + String dbOutPath = GenericTestUtils.getTempPath( + UUID.randomUUID() + "/out_sql.db"); // TODO : the following will fail due to empty Datanode list, need to fix. //String dnUUID = cluster.getDataNodes().get(0).getUuid(); String dbRootPath = conf.get(OzoneConfigKeys.OZONE_METADATA_DIRS); @@ -275,7 +274,7 @@ public class TestContainerSQLCli { rs = executeQuery(conn, sql); int count = 0; while (rs.next()) { - assertEquals("127.0.0.1", rs.getString("ipAddr")); + assertEquals(datanodeIpAddress, rs.getString("ipAddress")); //assertEquals(dnUUID, rs.getString("datanodeUUID")); count += 1; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSmallFile.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSmallFile.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSmallFile.java index 2e7f1b3..d75b66c 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSmallFile.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSmallFile.java @@ -19,10 +19,8 @@ package org.apache.hadoop.ozone.scm; import org.apache.hadoop.hdds.protocol.proto.ContainerProtos; import org.apache.hadoop.io.IOUtils; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.hdds.scm.container.placement.algorithms.ContainerPlacementPolicy; import org.apache.hadoop.hdds.scm.container.placement.algorithms.SCMContainerPlacementCapacity; @@ -59,17 +57,15 @@ public class TestContainerSmallFile { @BeforeClass public static void init() throws Exception { - long datanodeCapacities = 3 * OzoneConsts.TB; ozoneConfig = new OzoneConfiguration(); ozoneConfig.setClass(ScmConfigKeys.OZONE_SCM_CONTAINER_PLACEMENT_IMPL_KEY, SCMContainerPlacementCapacity.class, ContainerPlacementPolicy.class); - cluster = new MiniOzoneClassicCluster.Builder(ozoneConfig).numDataNodes(1) - .storageCapacities(new long[] {datanodeCapacities, datanodeCapacities}) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + cluster = MiniOzoneCluster.newBuilder(ozoneConfig).setNumDatanodes(1) + .build(); + cluster.waitForClusterToBeReady(); storageContainerLocationClient = cluster - .createStorageContainerLocationClient(); + .getStorageContainerLocationClient(); xceiverClientManager = new XceiverClientManager(ozoneConfig); - cluster.waitForHeartbeatProcessed(); } @AfterClass @@ -77,7 +73,7 @@ public class TestContainerSmallFile { if (cluster != null) { cluster.shutdown(); } - IOUtils.cleanupWithLogger(null, storageContainerLocationClient, cluster); + IOUtils.cleanupWithLogger(null, storageContainerLocationClient); } @Test http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java index 8524e93..fffdbff 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java @@ -20,10 +20,8 @@ package org.apache.hadoop.ozone.scm; import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.hdds.scm.StorageContainerManager; import org.apache.hadoop.io.IOUtils; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.MiniOzoneTestHelper; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.container.common.helpers.ContainerData; import org.apache.hadoop.ozone.container.common.helpers.KeyUtils; import org.apache.hadoop.hdds.protocol.proto.HddsProtos; @@ -61,7 +59,7 @@ import static org.junit.Assert.assertFalse; public class TestSCMCli { private static SCMCLI cli; - private static MiniOzoneClassicCluster cluster; + private static MiniOzoneCluster cluster; private static OzoneConfiguration conf; private static StorageContainerLocationProtocolClientSideTranslatorPB storageContainerLocationClient; @@ -82,11 +80,11 @@ public class TestSCMCli { @BeforeClass public static void setup() throws Exception { conf = new OzoneConfiguration(); - cluster = new MiniOzoneClassicCluster.Builder(conf).numDataNodes(3) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + cluster = MiniOzoneCluster.newBuilder(conf).setNumDatanodes(3).build(); + cluster.waitForClusterToBeReady(); xceiverClientManager = new XceiverClientManager(conf); storageContainerLocationClient = - cluster.createStorageContainerLocationClient(); + cluster.getStorageContainerLocationClient(); containerOperationClient = new ContainerOperationClient( storageContainerLocationClient, new XceiverClientManager(conf)); outContent = new ByteArrayOutputStream(); @@ -116,7 +114,10 @@ public class TestSCMCli { @AfterClass public static void shutdown() throws InterruptedException { - IOUtils.cleanupWithLogger(null, storageContainerLocationClient, cluster); + if (cluster != null) { + cluster.shutdown(); + } + IOUtils.cleanupWithLogger(null, storageContainerLocationClient); } @Test @@ -235,8 +236,8 @@ public class TestSCMCli { @Test public void testInfoContainer() throws Exception { // The cluster has one Datanode server. - DatanodeDetails datanodeDetails = MiniOzoneTestHelper - .getDatanodeDetails(cluster.getDataNodes().get(0)); + DatanodeDetails datanodeDetails = cluster.getHddsDatanodes().get(0) + .getDatanodeDetails(); String formatStr = "Container Name: %s\n" + "Container State: %s\n" + http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java index ecc7a94..27a9404 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java @@ -21,11 +21,8 @@ package org.apache.hadoop.ozone.scm; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hdds.scm.StorageContainerManager; -import org.apache.hadoop.io.IOUtils; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.hdds.scm.container.placement.metrics.ContainerStat; import org.apache.hadoop.hdds.scm.node.NodeManager; import org.junit.BeforeClass; @@ -65,18 +62,19 @@ public class TestSCMMXBean { public static void init() throws IOException, TimeoutException, InterruptedException { conf = new OzoneConfiguration(); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .numDataNodes(numOfDatanodes) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED) + cluster = MiniOzoneCluster.newBuilder(conf) + .setNumDatanodes(numOfDatanodes) .build(); - cluster.waitOzoneReady(); + cluster.waitForClusterToBeReady(); scm = cluster.getStorageContainerManager(); mbs = ManagementFactory.getPlatformMBeanServer(); } @AfterClass public static void shutdown() { - IOUtils.cleanupWithLogger(null, cluster); + if (cluster != null) { + cluster.shutdown(); + } } @Test http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMetrics.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMetrics.java index 2e7dcb8..c28f68f 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMetrics.java @@ -28,11 +28,9 @@ import org.apache.commons.codec.digest.DigestUtils; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.scm.StorageContainerManager; import org.apache.hadoop.hdds.scm.TestUtils; -import org.apache.hadoop.hdfs.server.datanode.DataNode; import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.metrics2.MetricsRecordBuilder; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; -import org.apache.hadoop.ozone.MiniOzoneTestHelper; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.container.common.helpers.ContainerReport; import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos; @@ -55,7 +53,7 @@ public class TestSCMMetrics { @Rule public Timeout testTimeout = new Timeout(90000); - private static MiniOzoneClassicCluster cluster = null; + private static MiniOzoneCluster cluster = null; @Test public void testContainerMetrics() throws Exception { @@ -71,9 +69,9 @@ public class TestSCMMetrics { OzoneConfiguration conf = new OzoneConfiguration(); try { - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED) - .numDataNodes(nodeCount).build(); + cluster = MiniOzoneCluster.newBuilder(conf) + .setNumDatanodes(nodeCount).build(); + cluster.waitForClusterToBeReady(); ContainerStat stat = new ContainerStat(size, used, keyCount, readBytes, writeBytes, readCount, writeCount); @@ -165,17 +163,16 @@ public class TestSCMMetrics { OzoneConfiguration conf = new OzoneConfiguration(); try { - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED) - .numDataNodes(nodeCount).build(); + cluster = MiniOzoneCluster.newBuilder(conf) + .setNumDatanodes(nodeCount).build(); + cluster.waitForClusterToBeReady(); ContainerStat stat = new ContainerStat(size, used, keyCount, readBytes, writeBytes, readCount, writeCount); StorageContainerManager scmManager = cluster.getStorageContainerManager(); - DataNode dataNode = cluster.getDataNodes().get(0); - String datanodeUuid = MiniOzoneTestHelper.getDatanodeDetails(dataNode) - .getUuidString(); + String datanodeUuid = cluster.getHddsDatanodes().get(0) + .getDatanodeDetails().getUuidString(); ContainerReportsRequestProto request = createContainerReport(numReport, stat, datanodeUuid); scmManager.sendContainerReport(request); http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java index 6f3bdf4..85403a2 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java @@ -20,10 +20,8 @@ package org.apache.hadoop.ozone.scm; import com.google.common.cache.Cache; import org.apache.commons.lang.RandomStringUtils; import org.apache.hadoop.io.IOUtils; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.hdds.scm.XceiverClientSpi; import org.apache.hadoop.hdds.scm.XceiverClientManager; @@ -57,18 +55,22 @@ public class TestXceiverClientManager { public ExpectedException exception = ExpectedException.none(); @BeforeClass - public static void init() throws IOException { + public static void init() throws Exception { config = new OzoneConfiguration(); - cluster = new MiniOzoneClassicCluster.Builder(config) - .numDataNodes(3) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + cluster = MiniOzoneCluster.newBuilder(config) + .setNumDatanodes(3) + .build(); + cluster.waitForClusterToBeReady(); storageContainerLocationClient = cluster - .createStorageContainerLocationClient(); + .getStorageContainerLocationClient(); } @AfterClass public static void shutdown() { - IOUtils.cleanupWithLogger(null, cluster, storageContainerLocationClient); + if (cluster != null) { + cluster.shutdown(); + } + IOUtils.cleanupWithLogger(null, storageContainerLocationClient); } @Test http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientMetrics.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientMetrics.java index 1a7a11e..1403f89 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientMetrics.java @@ -21,7 +21,6 @@ import static org.apache.hadoop.test.MetricsAsserts.assertCounter; import static org.apache.hadoop.test.MetricsAsserts.getLongCounter; import static org.apache.hadoop.test.MetricsAsserts.getMetrics; -import java.io.IOException; import java.util.List; import java.util.ArrayList; import java.util.concurrent.CompletableFuture; @@ -32,10 +31,8 @@ import org.apache.hadoop.hdds.protocol.proto.ContainerProtos; import org.apache.hadoop.hdds.protocol.proto.ContainerProtos.ContainerCommandRequestProto; import org.apache.hadoop.hdds.protocol.proto.ContainerProtos.ContainerCommandResponseProto; import org.apache.hadoop.metrics2.MetricsRecordBuilder; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.container.ContainerTestHelper; import org.apache.hadoop.ozone.web.utils.OzoneUtils; import org.apache.hadoop.hdds.scm.XceiverClientManager; @@ -63,13 +60,12 @@ public class TestXceiverClientMetrics { private static String containerOwner = "OZONE"; @BeforeClass - public static void init() throws IOException { + public static void init() throws Exception { config = new OzoneConfiguration(); - cluster = new MiniOzoneClassicCluster.Builder(config) - .numDataNodes(1) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); + cluster = MiniOzoneCluster.newBuilder(config).build(); + cluster.waitForClusterToBeReady(); storageContainerLocationClient = cluster - .createStorageContainerLocationClient(); + .getStorageContainerLocationClient(); } @AfterClass http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestQueryNode.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestQueryNode.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestQueryNode.java index 0748824..0b84f17 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestQueryNode.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/node/TestQueryNode.java @@ -16,10 +16,9 @@ */ package org.apache.hadoop.hdds.scm.node; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.proto.HddsProtos; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.hdds.scm.XceiverClientManager; import org.apache.hadoop.hdds.scm.client.ContainerOperationClient; import org.apache.hadoop.test.GenericTestUtils; @@ -34,7 +33,6 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState.DEAD; import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState.HEALTHY; -import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState.INVALID; import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState.STALE; import static org.apache.hadoop.hdds.scm.ScmConfigKeys @@ -52,7 +50,7 @@ import static org.junit.Assert.assertEquals; */ public class TestQueryNode { private static int numOfDatanodes = 5; - private MiniOzoneClassicCluster cluster; + private MiniOzoneCluster cluster; private ContainerOperationClient scmClient; @@ -67,13 +65,12 @@ public class TestQueryNode { conf.setTimeDuration(OZONE_SCM_STALENODE_INTERVAL, 3, SECONDS); conf.setTimeDuration(OZONE_SCM_DEADNODE_INTERVAL, 6, SECONDS); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .numDataNodes(numOfDatanodes) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED) + cluster = MiniOzoneCluster.newBuilder(conf) + .setNumDatanodes(numOfDatanodes) .build(); - cluster.waitOzoneReady(); + cluster.waitForClusterToBeReady(); scmClient = new ContainerOperationClient(cluster - .createStorageContainerLocationClient(), + .getStorageContainerLocationClient(), new XceiverClientManager(conf)); } @@ -95,8 +92,8 @@ public class TestQueryNode { @Test(timeout = 10 * 1000L) public void testStaleNodesCount() throws Exception { - cluster.shutdownDataNode(0); - cluster.shutdownDataNode(1); + cluster.shutdownHddsDatanode(0); + cluster.shutdownHddsDatanode(1); GenericTestUtils.waitFor(() -> cluster.getStorageContainerManager().getNodeCount(STALE) == 2, http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestDistributedOzoneVolumes.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestDistributedOzoneVolumes.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestDistributedOzoneVolumes.java index 94f621e..1015ae1 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestDistributedOzoneVolumes.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestDistributedOzoneVolumes.java @@ -17,9 +17,7 @@ */ package org.apache.hadoop.ozone.web; -import org.apache.hadoop.hdfs.server.datanode.DataNode; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; -import org.apache.hadoop.ozone.MiniOzoneTestHelper; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.ozone.OzoneConsts; @@ -49,7 +47,7 @@ public class TestDistributedOzoneVolumes extends TestOzoneHelper { @Rule public Timeout testTimeout = new Timeout(300000); - private static MiniOzoneClassicCluster cluster = null; + private static MiniOzoneCluster cluster = null; private static int port = 0; /** @@ -66,10 +64,10 @@ public class TestDistributedOzoneVolumes extends TestOzoneHelper { Logger.getLogger("log4j.logger.org.apache.http").setLevel(Level.DEBUG); conf.set(OzoneConfigKeys.OZONE_HANDLER_TYPE_KEY, OzoneConsts.OZONE_HANDLER_DISTRIBUTED); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); - DataNode dataNode = cluster.getDataNodes().get(0); - port = MiniOzoneTestHelper.getOzoneRestPort(dataNode); + cluster = MiniOzoneCluster.newBuilder(conf).build(); + cluster.waitForClusterToBeReady(); + port = cluster.getHddsDatanodes().get(0) + .getDatanodeDetails().getOzoneRestPort(); } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestLocalOzoneVolumes.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestLocalOzoneVolumes.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestLocalOzoneVolumes.java index 27f8ddb..922587e 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestLocalOzoneVolumes.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestLocalOzoneVolumes.java @@ -17,18 +17,16 @@ */ package org.apache.hadoop.ozone.web; -import org.apache.hadoop.hdfs.server.datanode.DataNode; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; -import org.apache.hadoop.ozone.MiniOzoneTestHelper; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.TestOzoneHelper; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.test.GenericTestUtils; import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.Timeout; @@ -45,7 +43,7 @@ public class TestLocalOzoneVolumes extends TestOzoneHelper { @Rule public Timeout testTimeout = new Timeout(300000); - private static MiniOzoneClassicCluster cluster = null; + private static MiniOzoneCluster cluster = null; private static int port = 0; /** @@ -69,10 +67,10 @@ public class TestLocalOzoneVolumes extends TestOzoneHelper { conf.set(OzoneConfigKeys.OZONE_LOCALSTORAGE_ROOT, path); Logger.getLogger("log4j.logger.org.apache.http").setLevel(Level.DEBUG); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_LOCAL).build(); - DataNode dataNode = cluster.getDataNodes().get(0); - port = MiniOzoneTestHelper.getOzoneRestPort(dataNode); + cluster = MiniOzoneCluster.newBuilder(conf).build(); + cluster.waitForClusterToBeReady(); + port = cluster.getHddsDatanodes().get(0) + .getDatanodeDetails().getOzoneRestPort(); } /** @@ -175,7 +173,7 @@ public class TestLocalOzoneVolumes extends TestOzoneHelper { * * @throws IOException */ - @Test + @Test @Ignore public void testGetVolumesOfAnotherUserShouldFail() throws IOException { super.testGetVolumesOfAnotherUserShouldFail(port); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestOzoneRestWithMiniCluster.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestOzoneRestWithMiniCluster.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestOzoneRestWithMiniCluster.java index ffd2003..5b67657 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestOzoneRestWithMiniCluster.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestOzoneRestWithMiniCluster.java @@ -24,7 +24,6 @@ import static org.apache.hadoop.ozone.OzoneConsts.CHUNK_SIZE; import static org.junit.Assert.*; import org.apache.commons.lang.RandomStringUtils; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.web.client.OzoneRestClient; import org.junit.AfterClass; @@ -61,15 +60,21 @@ public class TestOzoneRestWithMiniCluster { @BeforeClass public static void init() throws Exception { conf = new OzoneConfiguration(); - cluster = new MiniOzoneClassicCluster.Builder(conf).numDataNodes(1) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); - cluster.waitOzoneReady(); - ozoneClient = cluster.createOzoneRestClient(); + cluster = MiniOzoneCluster.newBuilder(conf).build(); + cluster.waitForClusterToBeReady(); + int port = cluster.getHddsDatanodes().get(0) + .getDatanodeDetails().getOzoneRestPort(); + ozoneClient = new OzoneRestClient( + String.format("http://localhost:%d";, port)); + ozoneClient.setUserAuth(OzoneConsts.OZONE_SIMPLE_HDFS_USER); } @AfterClass public static void shutdown() throws InterruptedException { - IOUtils.cleanupWithLogger(null, ozoneClient, cluster); + if (cluster != null) { + cluster.shutdown(); + } + IOUtils.cleanupWithLogger(null, ozoneClient); } @Test http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestOzoneWebAccess.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestOzoneWebAccess.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestOzoneWebAccess.java index 58c73ba..6c32f07 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestOzoneWebAccess.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/TestOzoneWebAccess.java @@ -18,9 +18,7 @@ package org.apache.hadoop.ozone.web; -import org.apache.hadoop.hdfs.server.datanode.DataNode; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; -import org.apache.hadoop.ozone.MiniOzoneTestHelper; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.ozone.OzoneConsts; @@ -57,7 +55,7 @@ public class TestOzoneWebAccess { @Rule public Timeout testTimeout = new Timeout(300000); - private static MiniOzoneClassicCluster cluster; + private static MiniOzoneCluster cluster; private static int port; /** @@ -77,10 +75,10 @@ public class TestOzoneWebAccess { .getTempPath(TestOzoneWebAccess.class.getSimpleName()); conf.set(OzoneConfigKeys.OZONE_LOCALSTORAGE_ROOT, path); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_LOCAL).build(); - DataNode dataNode = cluster.getDataNodes().get(0); - port = MiniOzoneTestHelper.getOzoneRestPort(dataNode); + cluster = MiniOzoneCluster.newBuilder(conf).build(); + cluster.waitForClusterToBeReady(); + port = cluster.getHddsDatanodes().get(0) + .getDatanodeDetails().getOzoneRestPort(); } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestBuckets.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestBuckets.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestBuckets.java index d6ebcfe..46539e7 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestBuckets.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestBuckets.java @@ -18,12 +18,9 @@ package org.apache.hadoop.ozone.web.client; import org.apache.hadoop.fs.StorageType; -import org.apache.hadoop.hdfs.server.datanode.DataNode; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; -import org.apache.hadoop.ozone.MiniOzoneTestHelper; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.client.rest.OzoneException; import org.apache.hadoop.ozone.web.request.OzoneQuota; import org.apache.hadoop.ozone.web.utils.OzoneUtils; @@ -55,7 +52,7 @@ public class TestBuckets { @Rule public Timeout testTimeout = new Timeout(300000); - private static MiniOzoneClassicCluster cluster = null; + private static MiniOzoneCluster cluster = null; private static OzoneRestClient ozoneRestClient = null; /** @@ -78,10 +75,9 @@ public class TestBuckets { OzoneConfigKeys.OZONE_LOCALSTORAGE_ROOT_DEFAULT); conf.set(OzoneConfigKeys.OZONE_LOCALSTORAGE_ROOT, path); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); - DataNode dataNode = cluster.getDataNodes().get(0); - final int port = MiniOzoneTestHelper.getOzoneRestPort(dataNode); + cluster = MiniOzoneCluster.newBuilder(conf).build(); + final int port = cluster.getHddsDatanodes().get(0).getDatanodeDetails() + .getOzoneRestPort(); ozoneRestClient = new OzoneRestClient( String.format("http://localhost:%d";, port)); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeys.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeys.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeys.java index 8ec7e33..ae30fb3 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeys.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeys.java @@ -26,13 +26,10 @@ import org.apache.commons.lang.math.RandomUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import org.apache.hadoop.fs.StorageType; -import org.apache.hadoop.hdfs.server.datanode.DataNode; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; -import org.apache.hadoop.ozone.MiniOzoneTestHelper; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.proto.ContainerProtos; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.container.common.helpers.ContainerData; import org.apache.hadoop.ozone.container.common.helpers.ContainerUtils; import org.apache.hadoop.ozone.container.common.helpers.KeyData; @@ -87,7 +84,7 @@ public class TestKeys { @Rule public Timeout testTimeout = new Timeout(300000); - private static MiniOzoneClassicCluster ozoneCluster = null; + private static MiniOzoneCluster ozoneCluster = null; private static String path; private static OzoneRestClient ozoneRestClient = null; private static long currentTime; @@ -108,10 +105,10 @@ public class TestKeys { path = GenericTestUtils.getTempPath(TestKeys.class.getSimpleName()); Logger.getLogger("log4j.logger.org.apache.http").setLevel(Level.DEBUG); - ozoneCluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); - DataNode dataNode = ozoneCluster.getDataNodes().get(0); - final int port = MiniOzoneTestHelper.getOzoneRestPort(dataNode); + ozoneCluster = MiniOzoneCluster.newBuilder(conf).build(); + ozoneCluster.waitForClusterToBeReady(); + final int port = ozoneCluster.getHddsDatanodes().get(0) + .getDatanodeDetails().getOzoneRestPort(); ozoneRestClient = new OzoneRestClient( String.format("http://localhost:%d";, port)); currentTime = Time.now(); @@ -277,12 +274,12 @@ public class TestKeys { } private static void restartDatanode( - MiniOzoneClassicCluster cluster, int datanodeIdx, OzoneRestClient client) - throws IOException, OzoneException, URISyntaxException { - cluster.restartDataNode(datanodeIdx); + MiniOzoneCluster cluster, int datanodeIdx, OzoneRestClient client) + throws OzoneException, URISyntaxException { + cluster.restartHddsDatanode(datanodeIdx); // refresh the datanode endpoint uri after datanode restart - DataNode dataNode = cluster.getDataNodes().get(datanodeIdx); - final int port = MiniOzoneTestHelper.getOzoneRestPort(dataNode); + final int port = ozoneCluster.getHddsDatanodes().get(0) + .getDatanodeDetails().getOzoneRestPort(); client.setEndPoint(String.format("http://localhost:%d";, port)); } @@ -297,14 +294,13 @@ public class TestKeys { } static void runTestPutAndGetKeyWithDnRestart( - PutHelper helper, MiniOzoneClassicCluster cluster) throws Exception { + PutHelper helper, MiniOzoneCluster cluster) throws Exception { String keyName = helper.putKey().getKeyName(); assertNotNull(helper.getBucket()); assertNotNull(helper.getFile()); // restart the datanode restartDatanode(cluster, 0, helper.client); - // verify getKey after the datanode restart String newFileName = helper.dir + "/" + OzoneUtils.getRequestID().toLowerCase(); @@ -609,8 +605,8 @@ public class TestKeys { Assert.assertEquals(20, bucketKeys.totalNumOfKeys()); int numOfCreatedKeys = 0; - OzoneContainer cm = MiniOzoneTestHelper - .getOzoneContainer(ozoneCluster.getDataNodes().get(0)); + OzoneContainer cm = ozoneCluster.getHddsDatanodes().get(0) + .getDatanodeStateMachine().getContainer(); // Expected to delete chunk file list. List<File> expectedChunkFiles = Lists.newArrayList(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeysRatis.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeysRatis.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeysRatis.java index ca0ac58..802cc3d 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeysRatis.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeysRatis.java @@ -18,7 +18,7 @@ package org.apache.hadoop.ozone.web.client; import org.apache.commons.lang.RandomStringUtils; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.RatisTestHelper; import org.junit.AfterClass; @@ -50,7 +50,7 @@ public class TestKeysRatis { @Rule public Timeout testTimeout = new Timeout(300000); private static RatisTestHelper.RatisTestSuite suite; - private static MiniOzoneClassicCluster ozoneCluster = null; + private static MiniOzoneCluster ozoneCluster = null; static private String path; private static OzoneRestClient ozoneRestClient = null; @@ -59,6 +59,7 @@ public class TestKeysRatis { suite = new RatisTestHelper.RatisTestSuite(TestBucketsRatis.class); path = suite.getConf().get(OzoneConfigKeys.OZONE_LOCALSTORAGE_ROOT); ozoneCluster = suite.getCluster(); + ozoneCluster.waitForClusterToBeReady(); ozoneRestClient = suite.newOzoneRestClient(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestOzoneClient.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestOzoneClient.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestOzoneClient.java index 2e7898b..627826e 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestOzoneClient.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestOzoneClient.java @@ -43,9 +43,7 @@ import io.netty.handler.codec.http.LastHttpContent; import io.netty.handler.logging.LogLevel; import io.netty.handler.logging.LoggingHandler; -import org.apache.hadoop.hdfs.server.datanode.DataNode; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; -import org.apache.hadoop.ozone.MiniOzoneTestHelper; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.ozone.OzoneConsts; @@ -86,7 +84,7 @@ import static io.netty.util.CharsetUtil.UTF_8; public class TestOzoneClient { private static Logger log = Logger.getLogger(TestOzoneClient.class); private static int testVolumeCount = 5; - private static MiniOzoneClassicCluster cluster = null; + private static MiniOzoneCluster cluster = null; private static String endpoint = null; @BeforeClass @@ -95,11 +93,11 @@ public class TestOzoneClient { OzoneConfiguration conf = new OzoneConfiguration(); conf.set(OzoneConfigKeys.OZONE_HANDLER_TYPE_KEY, OzoneConsts.OZONE_HANDLER_DISTRIBUTED); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); - DataNode dataNode = cluster.getDataNodes().get(0); - endpoint = String.format("http://localhost:%d";, - MiniOzoneTestHelper.getOzoneRestPort(dataNode)); + cluster = MiniOzoneCluster.newBuilder(conf).build(); + cluster.waitForClusterToBeReady(); + int port = cluster.getHddsDatanodes().get(0) + .getDatanodeDetails().getOzoneRestPort(); + endpoint = String.format("http://localhost:%d";, port); } @AfterClass http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestVolume.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestVolume.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestVolume.java index c1c1f4f..4cd90c9 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestVolume.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestVolume.java @@ -21,10 +21,8 @@ package org.apache.hadoop.ozone.web.client; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; -import org.apache.hadoop.hdfs.server.datanode.DataNode; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.MiniOzoneTestHelper; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.protocol.proto.KeySpaceManagerProtocolProtos.Status; @@ -63,7 +61,7 @@ import static org.mockito.Mockito.verify; * Test Ozone Volumes Lifecycle. */ public class TestVolume { - private static MiniOzoneClassicCluster cluster = null; + private static MiniOzoneCluster cluster = null; private static OzoneRestClient ozoneRestClient = null; /** @@ -88,10 +86,10 @@ public class TestVolume { conf.set(OzoneConfigKeys.OZONE_LOCALSTORAGE_ROOT, path); Logger.getLogger("log4j.logger.org.apache.http").setLevel(Level.DEBUG); - cluster = new MiniOzoneClassicCluster.Builder(conf) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); - DataNode dataNode = cluster.getDataNodes().get(0); - final int port = MiniOzoneTestHelper.getOzoneRestPort(dataNode); + cluster = MiniOzoneCluster.newBuilder(conf).build(); + cluster.waitForClusterToBeReady(); + final int port = cluster.getHddsDatanodes().get(0) + .getDatanodeDetails().getOzoneRestPort(); ozoneRestClient = new OzoneRestClient( String.format("http://localhost:%d";, port)); http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestVolumeRatis.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestVolumeRatis.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestVolumeRatis.java index 97f3ee9..8314851 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestVolumeRatis.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestVolumeRatis.java @@ -19,11 +19,9 @@ package org.apache.hadoop.ozone.web.client; import org.apache.commons.io.FileUtils; -import org.apache.hadoop.hdfs.server.datanode.DataNode; -import org.apache.hadoop.ozone.MiniOzoneClassicCluster; +import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.client.rest.OzoneException; import org.apache.hadoop.test.GenericTestUtils; @@ -41,7 +39,7 @@ public class TestVolumeRatis { @Rule public Timeout testTimeout = new Timeout(300000); private static OzoneRestClient ozoneClient; - private static MiniOzoneClassicCluster cluster; + private static MiniOzoneCluster cluster; @BeforeClass public static void init() throws Exception { @@ -60,10 +58,10 @@ public class TestVolumeRatis { conf.set(OzoneConfigKeys.OZONE_LOCALSTORAGE_ROOT, path); Logger.getLogger("log4j.logger.org.apache.http").setLevel(Level.DEBUG); - cluster = new MiniOzoneClassicCluster.Builder(conf).numDataNodes(3) - .setHandlerType(OzoneConsts.OZONE_HANDLER_DISTRIBUTED).build(); - DataNode dataNode = cluster.getDataNodes().get(0); - final int port = dataNode.getInfoPort(); + cluster = MiniOzoneCluster.newBuilder(conf).setNumDatanodes(3).build(); + cluster.waitForClusterToBeReady(); + final int port = cluster.getHddsDatanodes().get(0) + .getDatanodeDetails().getOzoneRestPort(); ozoneClient = new OzoneRestClient( String.format("http://localhost:%d";, port)); http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/integration-test/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/resources/log4j.properties b/hadoop-ozone/integration-test/src/test/resources/log4j.properties new file mode 100644 index 0000000..cad9dd1 --- /dev/null +++ b/hadoop-ozone/integration-test/src/test/resources/log4j.properties @@ -0,0 +1,18 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# log4j configuration used during build and unit tests + +log4j.rootLogger=info,stdout +log4j.threshold=ALL +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/06d228a3/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/scm/cli/SQLCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/scm/cli/SQLCLI.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/scm/cli/SQLCLI.java index e15c722..edfbf02 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/scm/cli/SQLCLI.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/scm/cli/SQLCLI.java @@ -104,8 +104,8 @@ public class SQLCLI extends Configured implements Tool { "VALUES (\"%s\", \"%s\")"; private static final String INSERT_DATANODE_INFO = "INSERT INTO datanodeInfo (hostname, datanodeUUid, ipAddress, " + - "containerPort,) " + - "VALUES (\"%s\", \"%s\", \"%s\", %d"; + "containerPort) " + + "VALUES (\"%s\", \"%s\", \"%s\", \"%d\")"; private static final String INSERT_CONTAINER_MEMBERS = "INSERT INTO containerMembers (containerName, datanodeUUID) " + "VALUES (\"%s\", \"%s\")"; @@ -644,7 +644,7 @@ public class SQLCLI extends Configured implements Tool { String insertDatanodeDetails = String .format(INSERT_DATANODE_INFO, datanodeDetails.getHostName(), - datanodeDetails.getUuid(), datanodeDetails.getIpAddress(), + datanodeDetails.getUuidString(), datanodeDetails.getIpAddress(), datanodeDetails.getContainerPort()); executeSQL(conn, insertDatanodeDetails); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
