diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManager.java index 29566e78f68..de588c712e0 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManager.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManager.java @@ -112,10 +112,6 @@ NavigableSet getContainersInPipeline(PipelineID pipelineID) void openPipeline(PipelineID pipelineId) throws IOException; - @Deprecated - void closePipeline(Pipeline pipeline, boolean onTimeout) - throws IOException; - void closePipeline(PipelineID pipelineID) throws IOException; void deletePipeline(PipelineID pipelineID) throws IOException; diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java index 6bb59a2236e..56a29536b40 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java @@ -488,20 +488,6 @@ private void closeContainersForPipeline(final PipelineID pipelineId) } } - /** - * put pipeline in CLOSED state. - * @param pipeline - ID of the pipeline. - * @param onTimeout - whether to remove pipeline after some time. - * @throws IOException throws exception in case of failure - * @deprecated Do not use this method, onTimeout is not honored. - */ - @Override - @Deprecated - public void closePipeline(Pipeline pipeline, boolean onTimeout) - throws IOException { - closePipeline(pipeline.getId()); - } - /** * Move the Pipeline to CLOSED state. * @param pipelineID ID of the Pipeline to be closed diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/WritableECContainerProvider.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/WritableECContainerProvider.java index 91b4f26a86e..158bd91ef9f 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/WritableECContainerProvider.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/WritableECContainerProvider.java @@ -137,7 +137,7 @@ public ContainerInfo getContainer(final long size, if (containerInfo == null || !containerHasSpace(containerInfo, size)) { existingPipelines.remove(pipelineIndex); - pipelineManager.closePipeline(pipeline, true); + pipelineManager.closePipeline(pipeline.getId()); openPipelineCount--; } else { if (pipelineIsExcluded(pipeline, containerInfo, excludeList)) { @@ -151,7 +151,7 @@ public ContainerInfo getContainer(final long size, LOG.warn("Pipeline or container not found when selecting a writable " + "container", e); existingPipelines.remove(pipelineIndex); - pipelineManager.closePipeline(pipeline, true); + pipelineManager.closePipeline(pipeline.getId()); openPipelineCount--; } } diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java index 7bc437627aa..e48d40cc962 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java @@ -882,7 +882,7 @@ public void closePipeline(HddsProtos.PipelineID pipelineID) PipelineManager pipelineManager = scm.getPipelineManager(); Pipeline pipeline = pipelineManager.getPipeline(PipelineID.getFromProtobuf(pipelineID)); - pipelineManager.closePipeline(pipeline, true); + pipelineManager.closePipeline(pipeline.getId()); AUDIT.logWriteSuccess(buildAuditMessageForSuccess( SCMAction.CLOSE_PIPELINE, auditMap)); } catch (Exception ex) { diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/SCMUpgradeFinalizer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/SCMUpgradeFinalizer.java index 1e187b20814..891f2d38b90 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/SCMUpgradeFinalizer.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/SCMUpgradeFinalizer.java @@ -150,7 +150,7 @@ private void closePipelinesBeforeFinalization(PipelineManager pipelineManager) for (Pipeline pipeline : pipelineManager.getPipelines()) { if (pipeline.getPipelineState() != CLOSED) { - pipelineManager.closePipeline(pipeline, true); + pipelineManager.closePipeline(pipeline.getId()); } } diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java index eb2fb3437bd..d57e24f2315 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java @@ -575,7 +575,7 @@ public void testMultipleBlockAllocationWithClosedContainer() public void testBlockAllocationWithNoAvailablePipelines() throws IOException { for (Pipeline pipeline : pipelineManager.getPipelines()) { - pipelineManager.closePipeline(pipeline, false); + pipelineManager.closePipeline(pipeline.getId()); } assertEquals(0, pipelineManager.getPipelines(replicationConfig).size()); assertNotNull(blockManager diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockPipelineManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockPipelineManager.java index f5d3eb540dd..cc4292b82b4 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockPipelineManager.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockPipelineManager.java @@ -236,17 +236,12 @@ public void openPipeline(final PipelineID pipelineId) } @Override - public void closePipeline(final Pipeline pipeline, final boolean onTimeout) + public void closePipeline(final PipelineID pipelineId) throws IOException { - stateManager.updatePipelineState(pipeline.getId().getProtobuf(), + stateManager.updatePipelineState(pipelineId.getProtobuf(), HddsProtos.PipelineState.PIPELINE_CLOSED); } - @Override - public void closePipeline(PipelineID pipelineID) throws IOException { - - } - @Override public void deletePipeline(PipelineID pipelineID) throws IOException { diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerImpl.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerImpl.java index 3a0b98ead40..f232890c96b 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerImpl.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerImpl.java @@ -350,7 +350,7 @@ public void testClosePipelineShouldFailOnFollower() throws Exception { Pipeline pipeline = assertAllocate(pipelineManager); changeToFollower(pipelineManager); assertFailsNotLeader( - () -> pipelineManager.closePipeline(pipeline, false)); + () -> pipelineManager.closePipeline(pipeline.getId())); } } @@ -521,7 +521,7 @@ public void testScrubPipelines() throws Exception { .createPipeline(RatisReplicationConfig .getInstance(ReplicationFactor.THREE)); pipelineManager.openPipeline(closedPipeline.getId()); - pipelineManager.closePipeline(closedPipeline, true); + pipelineManager.closePipeline(closedPipeline.getId()); // pipeline should be seen in pipelineManager as CLOSED. assertTrue(pipelineManager diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestWatchForCommit.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestWatchForCommit.java index f52083fa21f..432818b8f29 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestWatchForCommit.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestWatchForCommit.java @@ -276,7 +276,7 @@ public void testWatchForCommitForRetryfailure(RaftProtos.ReplicationLevel watchT cluster.shutdownHddsDatanode(pipeline.getNodes().get(1)); // emulate closing pipeline when SCM detects DEAD datanodes cluster.getStorageContainerManager() - .getPipelineManager().closePipeline(pipeline, false); + .getPipelineManager().closePipeline(pipeline.getId()); // again write data with more than max buffer limit. This wi // just watch for a log index which in not updated in the commitInfo Map // as well as there is no logIndex generate in Ratis. diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestScmApplyTransactionFailure.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestScmApplyTransactionFailure.java index 2bb67e9a884..b19fb0d2cfc 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestScmApplyTransactionFailure.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestScmApplyTransactionFailure.java @@ -69,7 +69,7 @@ public void testAddContainerToClosedPipeline() throws Exception { Pipeline pipeline = pipelines.get(0); // if testing for not-found pipeline, remove pipeline when closing. - pipelineManager.closePipeline(pipeline, true); + pipelineManager.closePipeline(pipeline.getId()); // adding container to a closed pipeline should yield an error. ContainerInfoProto containerInfo = createContainer(pipeline); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java index 3c19a039e14..71261ecebcc 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java @@ -184,7 +184,7 @@ public void testMinLeaderCountChoosePolicy() throws Exception { int destroyNum = RandomUtils.secure().randomInt(0, pipelines.size()); for (int k = 0; k <= destroyNum; k++) { - pipelineManager.closePipeline(pipelines.get(k), false); + pipelineManager.closePipeline(pipelines.get(k).getId()); } waitForPipelines(pipelineNum); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java index 292c20958e8..be69d5059ab 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java @@ -167,7 +167,7 @@ public void testPipelineCloseWithOpenContainer() assertEquals(1, setOpen.size()); pipelineManager - .closePipeline(ratisContainer.getPipeline(), false); + .closePipeline(ratisContainer.getPipeline().getId()); GenericTestUtils.waitFor(() -> { try { return containerManager diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineCreateAndDestroy.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineCreateAndDestroy.java index 699c03c6c94..fc38d3a6720 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineCreateAndDestroy.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineCreateAndDestroy.java @@ -90,7 +90,7 @@ public void testAutomaticPipelineCreationOnPipelineDestroy() .getPipelines(RatisReplicationConfig.getInstance( ReplicationFactor.THREE), Pipeline.PipelineState.OPEN); for (Pipeline pipeline : pipelines) { - pipelineManager.closePipeline(pipeline, false); + pipelineManager.closePipeline(pipeline.getId()); } // make sure two pipelines are created waitForPipelines(2); @@ -112,7 +112,7 @@ public void testAutomaticPipelineCreationDisablingFactorONE() .getPipelines(RatisReplicationConfig.getInstance( ReplicationFactor.THREE), Pipeline.PipelineState.OPEN); for (Pipeline pipeline : pipelines) { - pipelineManager.closePipeline(pipeline, false); + pipelineManager.closePipeline(pipeline.getId()); } // make sure two pipelines are created @@ -155,7 +155,7 @@ public void testPipelineCreationOnNodeRestart() throws Exception { // destroy the existing pipelines for (Pipeline pipeline : pipelines) { - pipelineManager.closePipeline(pipeline, false); + pipelineManager.closePipeline(pipeline.getId()); } if (cluster.getStorageContainerManager() diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestContainerCommandsEC.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestContainerCommandsEC.java index 7606c38c563..4b5847f43b8 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestContainerCommandsEC.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestContainerCommandsEC.java @@ -239,7 +239,7 @@ private void closeAllPipelines(ReplicationConfig replicationConfig) { Pipeline.PipelineState.OPEN) .forEach(p -> { try { - scm.getPipelineManager().closePipeline(p, false); + scm.getPipelineManager().closePipeline(p.getId()); } catch (IOException e) { throw new RuntimeException(e); } @@ -271,7 +271,7 @@ public void testOrphanBlock() throws Exception { ANY_USER, ContainerID.valueOf(orphanContainerID)); // Close the container by closing the pipeline - scm.getPipelineManager().closePipeline(orphanPipeline, false); + scm.getPipelineManager().closePipeline(orphanPipeline.getId()); // Find the datanode hosting Replica index = 2 HddsDatanodeService dn2Service = null; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/OzoneTestUtils.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/OzoneTestUtils.java index dc4f57731f9..600e9c28a03 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/OzoneTestUtils.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/OzoneTestUtils.java @@ -155,7 +155,7 @@ public static void closeContainer(StorageContainerManager scm, throws IOException, TimeoutException, InterruptedException { Pipeline pipeline = scm.getPipelineManager() .getPipeline(container.getPipelineID()); - scm.getPipelineManager().closePipeline(pipeline, true); + scm.getPipelineManager().closePipeline(pipeline.getId()); GenericTestUtils.waitFor(() -> container.getState() == HddsProtos.LifeCycleState.CLOSED, 200, 30000); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestECKeyOutputStream.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestECKeyOutputStream.java index 4a03bbad8a1..edd52c08736 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestECKeyOutputStream.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestECKeyOutputStream.java @@ -441,7 +441,7 @@ public void testECContainerKeysCountAndNumContainerReplicas() PipelineManager pm = cluster.getStorageContainerManager().getPipelineManager(); for (Pipeline p : pm.getPipelines(repConfig)) { - pm.closePipeline(p, true); + pm.closePipeline(p.getId()); } String keyName = UUID.randomUUID().toString(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestHelper.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestHelper.java index 75cbca00e5c..4890d080178 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestHelper.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestHelper.java @@ -289,7 +289,7 @@ public static void waitForPipelineClose(List pipelineList, for (Pipeline pipeline1 : pipelineList) { // issue pipeline destroy command cluster.getStorageContainerManager() - .getPipelineManager().closePipeline(pipeline1, false); + .getPipelineManager().closePipeline(pipeline1.getId()); } // wait for the pipeline to get destroyed in the datanodes diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java index 4a0a1a61f5c..b82e53a7507 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java @@ -213,7 +213,7 @@ public void testCloseContainerViaStandAlone() assertTrue(isContainerClosed(cluster, containerID, datanodeDetails)); cluster.getStorageContainerManager().getPipelineManager() - .closePipeline(pipeline, false); + .closePipeline(pipeline.getId()); Thread.sleep(5000); // Pipeline close should not affect a container in CLOSED state assertTrue(isContainerClosed(cluster, containerID, datanodeDetails)); @@ -317,7 +317,7 @@ public void testQuasiCloseTransitionViaRatis() // close the pipeline cluster.getStorageContainerManager() - .getPipelineManager().closePipeline(pipeline, false); + .getPipelineManager().closePipeline(pipeline.getId()); // All the containers in OPEN or CLOSING state should transition to // QUASI-CLOSED after pipeline close diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithPipelineDestroy.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithPipelineDestroy.java index 709b871042e..89732f45724 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithPipelineDestroy.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithPipelineDestroy.java @@ -128,6 +128,6 @@ private void destroyPipeline() throws Exception { PipelineManager pipelineManager = cluster.getStorageContainerManager().getPipelineManager(); Pipeline pipeline = pipelineManager.getPipeline(id); - pipelineManager.closePipeline(pipeline, false); + pipelineManager.closePipeline(pipeline.getId()); } }