This is an automated email from the ASF dual-hosted git repository. nanda pushed a commit to branch HDDS-2823 in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit 782057a4a15a4d562054c65d1e863e3a8bd8d368 Author: Nandakumar <[email protected]> AuthorDate: Sun Oct 25 19:50:47 2020 +0530 Resolving master merge conflict. --- .../hadoop/hdds/scm/block/BlockManagerImpl.java | 2 +- .../scm/container/CloseContainerEventHandler.java | 2 +- .../apache/hadoop/hdds/scm/ha/SCMHAManager.java | 2 +- .../hadoop/hdds/scm/ha/SCMHAManagerImpl.java | 2 +- .../hadoop/hdds/scm/node/NewNodeHandler.java | 2 +- .../scm/node/NonHealthyToHealthyNodeHandler.java | 2 +- .../hadoop/hdds/scm/pipeline/PipelineFactory.java | 3 +- .../hadoop/hdds/scm/pipeline/PipelineManager.java | 2 +- .../hdds/scm/pipeline/PipelineManagerMXBean.java | 2 +- .../hdds/scm/pipeline/PipelineManagerV2Impl.java | 14 ++++- .../hadoop/hdds/scm/ha/MockSCMHAManager.java | 4 +- .../hadoop/hdds/scm/ha/TestSCMRatisResponse.java | 4 +- .../hdds/scm/pipeline/MockPipelineManager.java | 10 ++++ .../scm/pipeline/MockRatisPipelineProvider.java | 9 ++- .../scm/pipeline/TestPipelineActionHandler.java | 2 +- .../hdds/scm/pipeline/TestPipelineManagerImpl.java | 2 +- .../hdds/scm/pipeline/TestLeaderChoosePolicy.java | 2 +- .../hadoop/ozone/TestStorageContainerManager.java | 4 -- .../client/rpc/TestDiscardPreallocatedBlocks.java | 2 +- .../hadoop/ozone/scm/TestCloseContainer.java | 2 +- .../apache/hadoop/ozone/shell/TestScmAdminHA.java | 3 +- .../org/apache/hadoop/ozone/om/OzoneManager.java | 1 + .../webapps/recon/ozone-recon-web/pnpm-lock.yaml | 66 ++++++++++------------ .../admin/scm/GetScmRatisRolesSubcommand.java | 9 ++- .../apache/hadoop/ozone/admin/scm/ScmAdmin.java | 6 +- 25 files changed, 86 insertions(+), 73 deletions(-) diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java index ec0094b..06d34ed 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java @@ -58,7 +58,7 @@ import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVI import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_TIMEOUT; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_TIMEOUT_DEFAULT; -import org.apache.ratis.protocol.NotLeaderException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/CloseContainerEventHandler.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/CloseContainerEventHandler.java index a2b79fb..da22193 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/CloseContainerEventHandler.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/CloseContainerEventHandler.java @@ -29,7 +29,7 @@ import org.apache.hadoop.hdds.server.events.EventHandler; import org.apache.hadoop.hdds.server.events.EventPublisher; import org.apache.hadoop.ozone.protocol.commands.CloseContainerCommand; import org.apache.hadoop.ozone.protocol.commands.CommandForDatanode; -import org.apache.ratis.protocol.NotLeaderException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManager.java index dc68b41..8ee26a2 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManager.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManager.java @@ -18,8 +18,8 @@ package org.apache.hadoop.hdds.scm.ha; import java.util.List; -import org.apache.ratis.protocol.NotLeaderException; import org.apache.ratis.protocol.RaftPeer; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import java.io.IOException; diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManagerImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManagerImpl.java index e2aa04f..c86c7d9 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManagerImpl.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManagerImpl.java @@ -21,10 +21,10 @@ import com.google.common.base.Preconditions; import java.util.List; import java.util.stream.Collectors; import org.apache.hadoop.hdds.conf.ConfigurationSource; -import org.apache.ratis.protocol.NotLeaderException; import org.apache.ratis.protocol.RaftGroupMemberId; import org.apache.ratis.protocol.RaftPeer; import org.apache.ratis.protocol.RaftPeerId; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.apache.ratis.server.RaftServer; import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.server.impl.RaftServerProxy; diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NewNodeHandler.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NewNodeHandler.java index 42cada9..08b5152 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NewNodeHandler.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NewNodeHandler.java @@ -23,7 +23,7 @@ import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.hdds.scm.pipeline.PipelineManager; import org.apache.hadoop.hdds.server.events.EventHandler; import org.apache.hadoop.hdds.server.events.EventPublisher; -import org.apache.ratis.protocol.NotLeaderException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NonHealthyToHealthyNodeHandler.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NonHealthyToHealthyNodeHandler.java index e73231b..1cb6501 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NonHealthyToHealthyNodeHandler.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NonHealthyToHealthyNodeHandler.java @@ -23,7 +23,7 @@ import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.hdds.scm.pipeline.PipelineManager; import org.apache.hadoop.hdds.server.events.EventHandler; import org.apache.hadoop.hdds.server.events.EventPublisher; -import org.apache.ratis.protocol.NotLeaderException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineFactory.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineFactory.java index bdd5053..68401d2 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineFactory.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineFactory.java @@ -45,7 +45,8 @@ public class PipelineFactory { providers.put(ReplicationType.STAND_ALONE, new SimplePipelineProvider(nodeManager, stateManager)); providers.put(ReplicationType.RATIS, - new RatisPipelineProvider(nodeManager, stateManager, conf, + new RatisPipelineProvider(nodeManager, + (PipelineStateManager) stateManager, conf, eventPublisher)); } 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 ddd461b..9f714da 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 @@ -30,7 +30,7 @@ import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType; import org.apache.hadoop.hdds.scm.container.ContainerID; import org.apache.hadoop.hdds.scm.safemode.SCMSafeModeManager.SafeModeStatus; import org.apache.hadoop.hdds.server.events.EventHandler; -import org.apache.ratis.protocol.NotLeaderException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; /** * Interface which exposes the api for pipeline management. diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerMXBean.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerMXBean.java index 55e096b..57eab61 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerMXBean.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerMXBean.java @@ -19,7 +19,7 @@ package org.apache.hadoop.hdds.scm.pipeline; import org.apache.hadoop.hdds.annotation.InterfaceAudience; -import org.apache.ratis.protocol.NotLeaderException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import java.util.Map; diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerV2Impl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerV2Impl.java index 4690f29..8c4d7b7 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerV2Impl.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerV2Impl.java @@ -36,7 +36,7 @@ import org.apache.hadoop.hdds.utils.Scheduler; import org.apache.hadoop.hdds.utils.db.Table; import org.apache.hadoop.metrics2.util.MBeans; import org.apache.hadoop.util.Time; -import org.apache.ratis.protocol.NotLeaderException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -460,6 +460,18 @@ public final class PipelineManagerV2Impl implements PipelineManager { metrics.incNumBlocksAllocated(id); } + @Override + public int minHealthyVolumeNum(Pipeline pipeline) { + // TODO: + throw new UnsupportedOperationException(); + } + + @Override + public int minPipelineLimit(Pipeline pipeline) { + // TODO: + throw new UnsupportedOperationException(); + } + /** * Activates a dormant pipeline. * diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/MockSCMHAManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/MockSCMHAManager.java index e31e7e1..886eaee 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/MockSCMHAManager.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/MockSCMHAManager.java @@ -29,14 +29,14 @@ import com.google.protobuf.InvalidProtocolBufferException; import org.apache.hadoop.hdds.protocol.proto.SCMRatisProtocol.RequestType; import org.apache.ratis.protocol.ClientId; import org.apache.ratis.protocol.Message; -import org.apache.ratis.protocol.NotLeaderException; import org.apache.ratis.protocol.RaftClientReply; import org.apache.ratis.protocol.RaftGroupId; import org.apache.ratis.protocol.RaftGroupMemberId; import org.apache.ratis.protocol.RaftPeer; import org.apache.ratis.protocol.RaftPeerId; -import org.apache.ratis.protocol.StateMachineException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.apache.ratis.server.RaftServer; +import org.apache.ratis.protocol.exceptions.StateMachineException; /** * Mock SCMHAManager implementation for testing. diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMRatisResponse.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMRatisResponse.java index daf0856..05e2970 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMRatisResponse.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMRatisResponse.java @@ -20,13 +20,13 @@ package org.apache.hadoop.hdds.scm.ha; import com.google.protobuf.InvalidProtocolBufferException; import org.apache.ratis.protocol.ClientId; -import org.apache.ratis.protocol.LeaderNotReadyException; import org.apache.ratis.protocol.Message; import org.apache.ratis.protocol.RaftClientReply; -import org.apache.ratis.protocol.RaftException; import org.apache.ratis.protocol.RaftGroupId; import org.apache.ratis.protocol.RaftGroupMemberId; import org.apache.ratis.protocol.RaftPeerId; +import org.apache.ratis.protocol.exceptions.LeaderNotReadyException; +import org.apache.ratis.protocol.exceptions.RaftException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; 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 6292ad4..947cd37 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 @@ -193,6 +193,16 @@ public final class MockPipelineManager implements PipelineManager { } @Override + public int minHealthyVolumeNum(Pipeline pipeline) { + return 0; + } + + @Override + public int minPipelineLimit(Pipeline pipeline) { + return 0; + } + + @Override public void activatePipeline(final PipelineID pipelineID) throws IOException { diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java index 49cac8b..cd0c475 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java @@ -39,20 +39,23 @@ public class MockRatisPipelineProvider extends RatisPipelineProvider { NodeManager nodeManager, StateManager stateManager, ConfigurationSource conf, EventPublisher eventPublisher, boolean autoOpen) { - super(nodeManager, stateManager, conf, eventPublisher); + super(nodeManager, (PipelineStateManager) stateManager, + conf, eventPublisher); autoOpenPipeline = autoOpen; } public MockRatisPipelineProvider(NodeManager nodeManager, StateManager stateManager, ConfigurationSource conf) { - super(nodeManager, stateManager, conf, new EventQueue()); + super(nodeManager, (PipelineStateManager) stateManager, + conf, new EventQueue()); } public MockRatisPipelineProvider( NodeManager nodeManager, StateManager stateManager, ConfigurationSource conf, EventPublisher eventPublisher) { - super(nodeManager, stateManager, conf, eventPublisher); + super(nodeManager, (PipelineStateManager) stateManager, + conf, eventPublisher); autoOpenPipeline = true; } diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineActionHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineActionHandler.java index e40c8ba..4517b89 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineActionHandler.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineActionHandler.java @@ -25,7 +25,7 @@ import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolPro import org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher.PipelineActionsFromDatanode; import org.apache.hadoop.hdds.server.events.EventQueue; import org.apache.hadoop.ozone.protocol.commands.CommandForDatanode; -import org.apache.ratis.protocol.NotLeaderException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.junit.Test; import org.mockito.Mockito; 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 642378f..51fff06 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 @@ -38,7 +38,7 @@ import org.apache.hadoop.hdds.utils.db.DBStoreBuilder; import org.apache.hadoop.metrics2.MetricsRecordBuilder; import org.apache.hadoop.ozone.container.common.SCMTestUtils; import org.apache.hadoop.test.GenericTestUtils; -import org.apache.ratis.protocol.NotLeaderException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.junit.After; import org.junit.Assert; import org.junit.Before; 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 ecf1c2f..c043c56 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 @@ -182,7 +182,7 @@ public class TestLeaderChoosePolicy { int destroyNum = r.nextInt(pipelines.size()); for (int k = 0; k <= destroyNum; k++) { - pipelineManager.finalizeAndDestroyPipeline(pipelines.get(k), false); + pipelineManager.closePipeline(pipelines.get(k), false); } waitForPipelines(pipelineNum); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java index 90f4996..ce696c5 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java @@ -26,12 +26,8 @@ import static org.apache.hadoop.hdds.HddsConfigKeys import static org.apache.hadoop.hdds.HddsConfigKeys .HDDS_SCM_SAFEMODE_PIPELINE_CREATION; import static org.junit.Assert.fail; -<<<<<<< HEAD import org.apache.hadoop.hdds.scm.TestUtils; -import org.junit.Ignore; -======= ->>>>>>> master import static org.mockito.Matchers.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDiscardPreallocatedBlocks.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDiscardPreallocatedBlocks.java index 37e13b6..fd52333 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDiscardPreallocatedBlocks.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestDiscardPreallocatedBlocks.java @@ -146,7 +146,7 @@ public class TestDiscardPreallocatedBlocks{ long containerID = locationInfos.get(0).getContainerID(); ContainerInfo container = cluster.getStorageContainerManager().getContainerManager() - .getContainer(ContainerID.valueof(containerID)); + .getContainer(ContainerID.valueOf(containerID)); Pipeline pipeline = cluster.getStorageContainerManager().getPipelineManager() .getPipeline(container.getPipelineID()); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestCloseContainer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestCloseContainer.java index fe05859..888422a 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestCloseContainer.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestCloseContainer.java @@ -105,7 +105,7 @@ public class TestCloseContainer { ContainerInfo container = scm.getContainerManager().getContainers().get(0); Pipeline pipeline = scm.getPipelineManager() .getPipeline(container.getPipelineID()); - scm.getPipelineManager().finalizeAndDestroyPipeline(pipeline, false); + scm.getPipelineManager().closePipeline(pipeline, false); GenericTestUtils.waitFor(() -> container.getState() == HddsProtos.LifeCycleState.CLOSED, 200, 30000); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestScmAdminHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestScmAdminHA.java index 63a8e71..02f8815 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestScmAdminHA.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestScmAdminHA.java @@ -19,10 +19,11 @@ package org.apache.hadoop.ozone.shell; import java.net.InetSocketAddress; import java.util.UUID; + +import org.apache.hadoop.hdds.cli.OzoneAdmin; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.scm.ScmConfigKeys; import org.apache.hadoop.ozone.MiniOzoneCluster; -import org.apache.hadoop.ozone.admin.OzoneAdmin; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java index 307ec30..b012a24 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java @@ -187,6 +187,7 @@ import org.apache.commons.lang3.tuple.Pair; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED_DEFAULT; +import static org.apache.hadoop.hdds.HddsUtils.getScmAddressForBlockClients; import static org.apache.hadoop.hdds.HddsUtils.getScmAddressForClients; import static org.apache.hadoop.hdds.security.x509.certificates.utils.CertificateSignRequest.getEncodedString; import static org.apache.hadoop.hdds.server.ServerUtils.getRemoteUserName; diff --git a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/pnpm-lock.yaml b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/pnpm-lock.yaml index 0385fd0..516ac88 100644 --- a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/pnpm-lock.yaml +++ b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/pnpm-lock.yaml @@ -42,7 +42,7 @@ devDependencies: json-server: 0.15.1 npm-run-all: 4.1.5 xo: 0.30.0 -lockfileVersion: 5.1 +lockfileVersion: 5.2 packages: /3d-view/2.0.0: dependencies: @@ -2033,7 +2033,7 @@ packages: jest-haste-map: 24.9.0 jest-message-util: 24.9.0 jest-regex-util: 24.9.0 - jest-resolve: [email protected] + jest-resolve: 24.9.0 jest-resolve-dependencies: 24.9.0 jest-runner: 24.9.0 jest-runtime: 24.9.0 @@ -2088,7 +2088,7 @@ packages: istanbul-lib-source-maps: 3.0.6 istanbul-reports: 2.2.7 jest-haste-map: 24.9.0 - jest-resolve: [email protected] + jest-resolve: 24.9.0 jest-runtime: 24.9.0 jest-util: 24.9.0 jest-worker: 24.9.0 @@ -2196,7 +2196,7 @@ packages: integrity: sha1-zlblOfg1UrWNENZy6k1vya3HsjQ= /@mapbox/mapbox-gl-supported/[email protected]: dependencies: - mapbox-gl: [email protected] + mapbox-gl: 1.10.1 dev: false peerDependencies: mapbox-gl: '>=0.32.1 <2.0.0' @@ -3470,7 +3470,7 @@ packages: mkdirp: 0.5.5 pify: 4.0.1 schema-utils: 2.7.0 - webpack: [email protected] + webpack: 4.42.0 dev: false engines: node: '>= 6.9' @@ -5016,7 +5016,7 @@ packages: postcss-modules-values: 3.0.0 postcss-value-parser: 4.1.0 schema-utils: 2.7.0 - webpack: [email protected] + webpack: 4.42.0 dev: false engines: node: '>= 8.9.0' @@ -6176,7 +6176,7 @@ packages: loader-utils: 1.4.0 object-hash: 2.0.3 schema-utils: 2.7.0 - webpack: [email protected] + webpack: 4.42.0 dev: false engines: node: '>= 8.9.0' @@ -6912,7 +6912,7 @@ packages: dependencies: loader-utils: 1.4.0 schema-utils: 2.7.0 - webpack: [email protected] + webpack: 4.42.0 dev: false engines: node: '>= 8.9.0' @@ -8216,7 +8216,7 @@ packages: pretty-error: 2.1.1 tapable: 1.1.3 util.promisify: 1.0.0 - webpack: [email protected] + webpack: 4.42.0 dev: false engines: node: '>=6.9' @@ -9214,7 +9214,7 @@ packages: jest-get-type: 24.9.0 jest-jasmine2: 24.9.0 jest-regex-util: 24.9.0 - jest-resolve: [email protected] + jest-resolve: 24.9.0 jest-util: 24.9.0 jest-validate: 24.9.0 micromatch: 3.1.10 @@ -9403,7 +9403,7 @@ packages: integrity: sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w== /jest-pnp-resolver/[email protected]: dependencies: - jest-resolve: [email protected] + jest-resolve: 24.9.0 dev: false engines: node: '>=6' @@ -9430,7 +9430,7 @@ packages: node: '>= 6' resolution: integrity: sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g== - /jest-resolve/[email protected]: + /jest-resolve/24.9.0: dependencies: '@jest/types': 24.9.0 browser-resolve: 1.11.3 @@ -9440,8 +9440,6 @@ packages: dev: false engines: node: '>= 6' - peerDependencies: - jest-resolve: '*' resolution: integrity: sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ== /jest-runner/24.9.0: @@ -9459,7 +9457,7 @@ packages: jest-jasmine2: 24.9.0 jest-leak-detector: 24.9.0 jest-message-util: 24.9.0 - jest-resolve: [email protected] + jest-resolve: 24.9.0 jest-runtime: 24.9.0 jest-util: 24.9.0 jest-worker: 24.9.0 @@ -9487,7 +9485,7 @@ packages: jest-message-util: 24.9.0 jest-mock: 24.9.0 jest-regex-util: 24.9.0 - jest-resolve: [email protected] + jest-resolve: 24.9.0 jest-snapshot: 24.9.0 jest-util: 24.9.0 jest-validate: 24.9.0 @@ -9517,7 +9515,7 @@ packages: jest-get-type: 24.9.0 jest-matcher-utils: 24.9.0 jest-message-util: 24.9.0 - jest-resolve: [email protected] + jest-resolve: 24.9.0 mkdirp: 0.5.5 natural-compare: 1.4.0 pretty-format: 24.9.0 @@ -10289,7 +10287,7 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= - /mapbox-gl/[email protected]: + /mapbox-gl/1.10.1: dependencies: '@mapbox/geojson-rewind': 0.5.0 '@mapbox/geojson-types': 1.0.2 @@ -10317,8 +10315,6 @@ packages: dev: false engines: node: '>=6.4.0' - peerDependencies: - mapbox-gl: '*' resolution: integrity: sha512-0aHt+lFUpYfvh0kMIqXqNXqoYMuhuAsMlw87TbhWrw78Tx2zfuPI0Lx31/YPUgJ+Ire0tzQ4JnuBL7acDNXmMg== /marching-simplex-table/1.0.0: @@ -10575,7 +10571,7 @@ packages: loader-utils: 1.4.0 normalize-url: 1.9.1 schema-utils: 1.0.0 - webpack: [email protected] + webpack: 4.42.0 webpack-sources: 1.4.3 dev: false engines: @@ -11304,7 +11300,7 @@ packages: dependencies: cssnano: 4.1.10 last-call-webpack-plugin: 3.0.0 - webpack: [email protected] + webpack: 4.42.0 dev: false peerDependencies: webpack: ^4.0.0 @@ -11870,7 +11866,7 @@ packages: has-hover: 1.0.1 has-passive-events: 1.0.0 is-mobile: 2.2.1 - mapbox-gl: [email protected] + mapbox-gl: 1.10.1 matrix-camera-controller: 2.1.3 mouse-change: 1.4.0 mouse-event-offset: 3.0.2 @@ -13658,7 +13654,7 @@ packages: identity-obj-proxy: 3.0.0 jest: 24.9.0 jest-environment-jsdom-fourteen: 1.0.1 - jest-resolve: [email protected] + jest-resolve: 24.9.0 jest-watch-typeahead: 0.4.2 mini-css-extract-plugin: [email protected] optimize-css-assets-webpack-plugin: [email protected] @@ -13679,7 +13675,7 @@ packages: ts-pnp: [email protected] typescript: 3.4.5 url-loader: [email protected][email protected] - webpack: [email protected] + webpack: 4.42.0 webpack-dev-server: [email protected] webpack-manifest-plugin: [email protected] workbox-webpack-plugin: [email protected] @@ -14512,7 +14508,7 @@ packages: neo-async: 2.6.1 schema-utils: 2.7.0 semver: 6.3.0 - webpack: [email protected] + webpack: 4.42.0 dev: false engines: node: '>= 8.9.0' @@ -15583,7 +15579,7 @@ packages: serialize-javascript: 3.1.0 source-map: 0.6.1 terser: 4.7.0 - webpack: [email protected] + webpack: 4.42.0 webpack-sources: 1.4.3 worker-farm: 1.7.0 dev: false @@ -15603,7 +15599,7 @@ packages: serialize-javascript: 2.1.2 source-map: 0.6.1 terser: 4.7.0 - webpack: [email protected] + webpack: 4.42.0 webpack-sources: 1.4.3 dev: false engines: @@ -16188,7 +16184,7 @@ packages: loader-utils: 1.4.0 mime: 2.4.6 schema-utils: 2.7.0 - webpack: [email protected] + webpack: 4.42.0 dev: false engines: node: '>= 8.9.0' @@ -16491,7 +16487,7 @@ packages: mime: 2.4.6 mkdirp: 0.5.5 range-parser: 1.2.1 - webpack: [email protected] + webpack: 4.42.0 webpack-log: 2.0.0 dev: false engines: @@ -16531,7 +16527,7 @@ packages: strip-ansi: 3.0.1 supports-color: 6.1.0 url: 0.11.0 - webpack: [email protected] + webpack: 4.42.0 webpack-dev-middleware: [email protected] webpack-log: 2.0.0 ws: 6.2.1 @@ -16563,7 +16559,7 @@ packages: lodash: 4.17.15 object.entries: 1.1.2 tapable: 1.1.3 - webpack: [email protected] + webpack: 4.42.0 dev: false engines: node: '>=6.11.5' @@ -16578,7 +16574,7 @@ packages: dev: false resolution: integrity: sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== - /webpack/[email protected]: + /webpack/4.42.0: dependencies: '@webassemblyjs/ast': 1.8.5 '@webassemblyjs/helper-module-context': 1.8.5 @@ -16607,8 +16603,6 @@ packages: engines: node: '>=6.11.5' hasBin: true - peerDependencies: - webpack: '*' resolution: integrity: sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w== /websocket-driver/0.7.4: @@ -16819,7 +16813,7 @@ packages: dependencies: '@babel/runtime': 7.10.2 json-stable-stringify: 1.0.1 - webpack: [email protected] + webpack: 4.42.0 workbox-build: 4.3.1 dev: false engines: diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/GetScmRatisRolesSubcommand.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/GetScmRatisRolesSubcommand.java index cf2310c..c784c44 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/GetScmRatisRolesSubcommand.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/GetScmRatisRolesSubcommand.java @@ -17,9 +17,10 @@ */ package org.apache.hadoop.ozone.admin.scm; +import java.io.IOException; import java.util.List; -import java.util.concurrent.Callable; import org.apache.hadoop.hdds.cli.HddsVersionProvider; +import org.apache.hadoop.hdds.scm.cli.ScmSubcommand; import org.apache.hadoop.hdds.scm.client.ScmClient; import picocli.CommandLine; @@ -31,16 +32,14 @@ import picocli.CommandLine; description = "List all SCMs and their respective Ratis server roles", mixinStandardHelpOptions = true, versionProvider = HddsVersionProvider.class) -public class GetScmRatisRolesSubcommand implements Callable<Void> { +public class GetScmRatisRolesSubcommand extends ScmSubcommand { @CommandLine.ParentCommand private ScmAdmin parent; @Override - public Void call() throws Exception { - ScmClient scmClient = parent.createScmClient(); + protected void execute(ScmClient scmClient) throws IOException { List<String> roles = scmClient.getScmRatisRoles(); System.out.println(roles); - return null; } } diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/ScmAdmin.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/ScmAdmin.java index 2605a6d..b05e65a 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/ScmAdmin.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/scm/ScmAdmin.java @@ -19,8 +19,7 @@ package org.apache.hadoop.ozone.admin.scm; import org.apache.hadoop.hdds.cli.GenericCli; import org.apache.hadoop.hdds.cli.HddsVersionProvider; -import org.apache.hadoop.hdds.scm.client.ScmClient; -import org.apache.hadoop.ozone.admin.OzoneAdmin; +import org.apache.hadoop.hdds.cli.OzoneAdmin; import picocli.CommandLine; import picocli.CommandLine.Model.CommandSpec; import picocli.CommandLine.Spec; @@ -54,7 +53,4 @@ public class ScmAdmin extends GenericCli { return null; } - public ScmClient createScmClient() { - return parent.createScmClient(); - } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
