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 deleted file mode 100644 index b998a4b2e29c..000000000000 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainerRatis.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ - -package org.apache.hadoop.ozone.container.ozoneimpl; - -import org.apache.hadoop.hdds.scm.pipeline.MockPipeline; -import org.apache.hadoop.ozone.HddsDatanodeService; -import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.RatisTestHelper; -import org.apache.hadoop.ozone.web.utils.OzoneUtils; -import org.apache.hadoop.hdds.scm.XceiverClientSpi; -import org.apache.hadoop.hdds.scm.pipeline.Pipeline; -import org.apache.ratis.rpc.RpcType; -import org.apache.ratis.rpc.SupportedRpcType; -import org.apache.ratis.util.function.CheckedBiConsumer; -import org.apache.ratis.util.CollectionUtils; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.Timeout; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.List; - -/** - * Tests ozone containers with Apache Ratis. - */ -@Ignore("Disabling Ratis tests for pipeline work.") -public class TestOzoneContainerRatis { - private static final Logger LOG = LoggerFactory.getLogger( - TestOzoneContainerRatis.class); - /** - * Set the timeout for every test. - */ - @Rule - public Timeout testTimeout = new Timeout(300000); - - static OzoneConfiguration newOzoneConfiguration() { - return new OzoneConfiguration(); - } - - private static void runTestOzoneContainerViaDataNodeRatis( - RpcType rpc, int numNodes) throws Exception { - runTest("runTestOzoneContainerViaDataNodeRatis", rpc, numNodes, - TestOzoneContainer::runTestOzoneContainerViaDataNode); - } - - private static void runTest( - String testName, RpcType rpc, int numNodes, - CheckedBiConsumer test) - throws Exception { - LOG.info("{}(rpc={}, numNodes={}", testName, rpc, numNodes); - - // create Ozone clusters - final OzoneConfiguration conf = newOzoneConfiguration(); - RatisTestHelper.initRatisConf(rpc, conf); - final MiniOzoneCluster cluster = - MiniOzoneCluster.newBuilder(conf) - .setNumDatanodes(numNodes) - .build(); - try { - cluster.waitForClusterToBeReady(); - - final String containerName = OzoneUtils.getRequestID(); - final List datanodes = cluster.getHddsDatanodes(); - final Pipeline pipeline = MockPipeline.createPipeline( - CollectionUtils.as(datanodes, - HddsDatanodeService::getDatanodeDetails)); - LOG.info("pipeline={}", pipeline); - - // Create Ratis cluster -// final String ratisId = "ratis1"; -// final PipelineManager manager = RatisManagerImpl.newRatisManager(conf); -// manager.createPipeline(ratisId, pipeline.getNodes()); -// LOG.info("Created RatisCluster " + ratisId); -// -// // check Ratis cluster members -// final List dns = manager.getMembers(ratisId); -// Assert.assertEquals(pipeline.getNodes(), dns); -// -// // run test -// final XceiverClientSpi client = XceiverClientRatis -// .newXceiverClientRatis( -// pipeline, conf); -// test.accept(containerName, client); - } finally { - cluster.shutdown(); - } - } - - private static void runTestBothGetandPutSmallFileRatis( - RpcType rpc, int numNodes) throws Exception { - runTest("runTestBothGetandPutSmallFileRatis", rpc, numNodes, - TestOzoneContainer::runTestBothGetandPutSmallFile); - } - - @Test - public void testOzoneContainerViaDataNodeRatisGrpc() throws Exception { - runTestOzoneContainerViaDataNodeRatis(SupportedRpcType.GRPC, 1); - runTestOzoneContainerViaDataNodeRatis(SupportedRpcType.GRPC, 3); - } - - @Test - public void testOzoneContainerViaDataNodeRatisNetty() throws Exception { - runTestOzoneContainerViaDataNodeRatis(SupportedRpcType.NETTY, 1); - runTestOzoneContainerViaDataNodeRatis(SupportedRpcType.NETTY, 3); - } - - @Test - public void testBothGetandPutSmallFileRatisNetty() throws Exception { - runTestBothGetandPutSmallFileRatis(SupportedRpcType.NETTY, 1); - runTestBothGetandPutSmallFileRatis(SupportedRpcType.NETTY, 3); - } - - @Test - public void testBothGetandPutSmallFileRatisGrpc() throws Exception { - runTestBothGetandPutSmallFileRatis(SupportedRpcType.GRPC, 1); - runTestBothGetandPutSmallFileRatis(SupportedRpcType.GRPC, 3); - } - -}