From 341c076f0501067a5d4366b3451f6d6893153b7f Mon Sep 17 00:00:00 2001 From: Bharat Viswanadham Date: Fri, 8 Mar 2019 07:25:33 -0800 Subject: [PATCH] HDDS-1196. Add a ReplicationStartTimer class. (#567) --- .../apache/hadoop/hdds/HddsConfigKeys.java | 11 ++ .../src/main/resources/ozone-default.xml | 10 ++ .../hadoop/hdds/scm/block/BlockManager.java | 7 ++ .../hdds/scm/block/BlockManagerImpl.java | 7 +- .../hdds/scm/chillmode/ChillModeHandler.java | 106 ++++++++++++++++++ .../scm/chillmode/SCMChillModeManager.java | 20 +++- .../ReplicationActivityStatus.java | 56 ++++----- .../hadoop/hdds/scm/events/SCMEvents.java | 5 +- .../scm/server/SCMClientProtocolServer.java | 21 ++-- .../scm/server/StorageContainerManager.java | 19 ++-- .../hdds/scm/block/TestBlockManager.java | 19 ++-- .../scm/chillmode/TestChillModeHandler.java | 103 +++++++++++++++++ .../TestReplicationActivityStatus.java | 32 +++++- .../server/TestSCMClientProtocolServer.java | 12 +- .../hadoop/ozone/om/TestScmChillMode.java | 4 +- .../ozone/genesis/BenchMarkOzoneManager.java | 4 +- .../hadoop/ozone/genesis/BenchMarkSCM.java | 4 +- 17 files changed, 361 insertions(+), 79 deletions(-) create mode 100644 hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/ChillModeHandler.java create mode 100644 hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestChillModeHandler.java diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java index 184e3d880cd..5df4b026491 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java @@ -17,6 +17,9 @@ package org.apache.hadoop.hdds; import org.apache.hadoop.utils.db.DBProfile; +import org.apache.ratis.util.TimeDuration; + +import java.util.concurrent.TimeUnit; /** * This class contains constants for configuration keys and default values @@ -70,6 +73,14 @@ public final class HddsConfigKeys { "hdds.scm.chillmode.min.datanode"; public static final int HDDS_SCM_CHILLMODE_MIN_DATANODE_DEFAULT = 1; + + public static final String + HDDS_SCM_WAIT_TIME_AFTER_CHILL_MODE_EXIT = + "hdds.scm.wait.time.after.chillmode.exit"; + + public static final String + HDDS_SCM_WAIT_TIME_AFTER_CHILL_MODE_EXIT_DEFAULT = "5m"; + public static final String HDDS_SCM_CHILLMODE_PIPELINE_AVAILABILITY_CHECK = "hdds.scm.chillmode.pipeline-availability.check"; public static final boolean diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml index a0b4c5218be..eb68b6e3394 100644 --- a/hadoop-hdds/common/src/main/resources/ozone-default.xml +++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml @@ -1289,6 +1289,16 @@ + + hdds.scm.wait.time.after.chillmode.exit + 5m + HDDS,SCM,OPERATION + After exiting chillmode, wait for configured interval of + time to start replication monitor and cleanup activities of unhealthy + pipelines. + + + hdds.scm.chillmode.enabled true diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManager.java index a43b18c426b..a12a49d4a76 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManager.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManager.java @@ -79,4 +79,11 @@ AllocatedBlock allocateBlock(long size, HddsProtos.ReplicationType type, * @return the block deleting service executed in SCM. */ SCMBlockDeletingService getSCMBlockDeletingService(); + + /** + * Set ChillMode status. + * + * @param chillModeStatus + */ + void setChillModeStatus(boolean chillModeStatus); } 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 0e4bb50b6d9..35ddf18aeb3 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 @@ -66,8 +66,7 @@ /** Block Manager manages the block access for SCM. */ -public class BlockManagerImpl implements EventHandler, - BlockManager, BlockmanagerMXBean { +public class BlockManagerImpl implements BlockManager, BlockmanagerMXBean { private static final Logger LOG = LoggerFactory.getLogger(BlockManagerImpl.class); // TODO : FIX ME : Hard coding the owner. @@ -337,8 +336,8 @@ public SCMBlockDeletingService getSCMBlockDeletingService() { } @Override - public void onMessage(Boolean inChillMode, EventPublisher publisher) { - this.chillModePrecheck.setInChillMode(inChillMode); + public void setChillModeStatus(boolean chillModeStatus) { + this.chillModePrecheck.setInChillMode(chillModeStatus); } /** diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/ChillModeHandler.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/ChillModeHandler.java new file mode 100644 index 00000000000..95e0d93a63c --- /dev/null +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/ChillModeHandler.java @@ -0,0 +1,106 @@ +/* + * 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.hdds.scm.chillmode; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hdds.HddsConfigKeys; +import org.apache.hadoop.hdds.scm.block.BlockManager; +import org.apache.hadoop.hdds.scm.container.replication. + ReplicationActivityStatus; +import org.apache.hadoop.hdds.scm.server.SCMClientProtocolServer; +import org.apache.hadoop.hdds.scm.chillmode.SCMChillModeManager.ChillModeStatus; +import org.apache.hadoop.hdds.server.events.EventHandler; +import org.apache.hadoop.hdds.server.events.EventPublisher; + +import java.util.Objects; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; + +/** + * Class to handle the activities needed to be performed after exiting chill + * mode. + */ +public class ChillModeHandler implements EventHandler { + + private final SCMClientProtocolServer scmClientProtocolServer; + private final BlockManager scmBlockManager; + private final long waitTime; + private final AtomicBoolean isInChillMode = new AtomicBoolean(true); + private final ReplicationActivityStatus replicationActivityStatus; + + + /** + * ChillModeHandler, to handle the logic once we exit chill mode. + * @param configuration + * @param clientProtocolServer + * @param blockManager + * @param replicationStatus + */ + public ChillModeHandler(Configuration configuration, + SCMClientProtocolServer clientProtocolServer, + BlockManager blockManager, + ReplicationActivityStatus replicationStatus) { + Objects.requireNonNull(configuration, "Configuration cannot be null"); + Objects.requireNonNull(clientProtocolServer, "SCMClientProtocolServer " + + "object cannot be null"); + Objects.requireNonNull(blockManager, "BlockManager object cannot be null"); + Objects.requireNonNull(replicationStatus, "ReplicationActivityStatus " + + "object cannot be null"); + this.waitTime = configuration.getTimeDuration( + HddsConfigKeys.HDDS_SCM_WAIT_TIME_AFTER_CHILL_MODE_EXIT, + HddsConfigKeys.HDDS_SCM_WAIT_TIME_AFTER_CHILL_MODE_EXIT_DEFAULT, + TimeUnit.MILLISECONDS); + scmClientProtocolServer = clientProtocolServer; + scmBlockManager = blockManager; + replicationActivityStatus = replicationStatus; + + boolean chillModeEnabled = configuration.getBoolean( + HddsConfigKeys.HDDS_SCM_CHILLMODE_ENABLED, + HddsConfigKeys.HDDS_SCM_CHILLMODE_ENABLED_DEFAULT); + isInChillMode.set(chillModeEnabled); + + } + + /** + * Set ChillMode status based on + * {@link org.apache.hadoop.hdds.scm.events.SCMEvents#CHILL_MODE_STATUS}. + * + * Inform BlockManager, ScmClientProtocolServer and replicationAcitivity + * status about chillMode status. + * + * @param chillModeStatus + * @param publisher + */ + @Override + public void onMessage(ChillModeStatus chillModeStatus, + EventPublisher publisher) { + isInChillMode.set(chillModeStatus.getChillModeStatus()); + + replicationActivityStatus.fireReplicationStart(isInChillMode.get(), + waitTime); + scmClientProtocolServer.setChillModeStatus(isInChillMode.get()); + scmBlockManager.setChillModeStatus(isInChillMode.get()); + + } + + public boolean getChillModeStatus() { + return isInChillMode.get(); + } + + +} diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/SCMChillModeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/SCMChillModeManager.java index 8ced6d5a95b..849a65695ca 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/SCMChillModeManager.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/SCMChillModeManager.java @@ -73,6 +73,7 @@ public SCMChillModeManager(Configuration conf, this.isChillModeEnabled = conf.getBoolean( HddsConfigKeys.HDDS_SCM_CHILLMODE_ENABLED, HddsConfigKeys.HDDS_SCM_CHILLMODE_ENABLED_DEFAULT); + if (isChillModeEnabled) { ContainerChillModeRule containerChillModeRule = new ContainerChillModeRule(config, allContainers, this); @@ -111,7 +112,8 @@ public SCMChillModeManager(Configuration conf, */ @VisibleForTesting public void emitChillModeStatus() { - eventPublisher.fireEvent(SCMEvents.CHILL_MODE_STATUS, getInChillMode()); + eventPublisher.fireEvent(SCMEvents.CHILL_MODE_STATUS, + new ChillModeStatus(getInChillMode())); } public void validateChillModeExitRules(EventPublisher eventQueue) { @@ -185,4 +187,20 @@ public OneReplicaPipelineChillModeRule getOneReplicaPipelineChillModeRule() { exitRules.get(ATLEAST_ONE_DATANODE_REPORTED_PIPELINE_EXIT_RULE); } + + /** + * Class used during ChillMode status event. + */ + public static class ChillModeStatus { + + private boolean chillModeStatus; + public ChillModeStatus(boolean chillModeState) { + this.chillModeStatus = chillModeState; + } + + public boolean getChillModeStatus() { + return chillModeStatus; + } + } + } diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationActivityStatus.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationActivityStatus.java index 5a2e2b112d2..9de06700f28 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationActivityStatus.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationActivityStatus.java @@ -20,11 +20,13 @@ import javax.management.ObjectName; import java.io.Closeable; import java.io.IOException; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.hadoop.hdds.server.events.EventHandler; -import org.apache.hadoop.hdds.server.events.EventPublisher; + +import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.metrics2.util.MBeans; + import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,15 +41,8 @@ public class ReplicationActivityStatus implements LoggerFactory.getLogger(ReplicationActivityStatus.class); private AtomicBoolean replicationEnabled = new AtomicBoolean(); - private AtomicBoolean replicationStatusSetExternally = new AtomicBoolean(); private ObjectName jmxObjectName; - private ReplicationStatusListener replicationStatusListener; - private ChillModeStatusListener chillModeStatusListener; - public ReplicationActivityStatus(){ - replicationStatusListener = new ReplicationStatusListener(); - chillModeStatusListener = new ChillModeStatusListener(); - } @Override public boolean isReplicationEnabled() { return replicationEnabled.get(); @@ -84,35 +79,26 @@ public void close() throws IOException { } /** - * Replication status listener. + * Waits for + * {@link HddsConfigKeys#HDDS_SCM_WAIT_TIME_AFTER_CHILL_MODE_EXIT} and set + * replicationEnabled to start replication monitor thread. */ - class ReplicationStatusListener implements EventHandler { - @Override - public void onMessage(Boolean status, EventPublisher publisher) { - replicationStatusSetExternally.set(true); - replicationEnabled.set(status); + public void fireReplicationStart(boolean chillModeStatus, + long waitTime) { + if (!chillModeStatus) { + CompletableFuture.runAsync(() -> { + try { + Thread.sleep(waitTime); + } catch (InterruptedException ex) { + LOG.error("Interrupted during wait, replication event is not fired", + ex); + } + setReplicationEnabled(true); + LOG.info("Replication Timer sleep for {} ms completed. Enable " + + "Replication", waitTime); + }); } } - /** - * Replication status is influenced by Chill mode status as well. - */ - class ChillModeStatusListener implements EventHandler { - - @Override - public void onMessage(Boolean inChillMode, EventPublisher publisher) { - if (!replicationStatusSetExternally.get()) { - replicationEnabled.set(!inChillMode); - } - } - } - - public ReplicationStatusListener getReplicationStatusListener() { - return replicationStatusListener; - } - - public ChillModeStatusListener getChillModeStatusListener() { - return chillModeStatusListener; - } } diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/events/SCMEvents.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/events/SCMEvents.java index 0eb8e1861a4..5be512ba63e 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/events/SCMEvents.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/events/SCMEvents.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.hdds.scm.block.PendingDeleteStatusList; +import org.apache.hadoop.hdds.scm.chillmode.SCMChillModeManager.ChillModeStatus; import org.apache.hadoop.hdds.scm.command.CommandStatusReportHandler; import org.apache.hadoop.hdds.scm.command.CommandStatusReportHandler .ReplicationStatus; @@ -253,8 +254,8 @@ public final class SCMEvents { */ public static final TypedEvent START_REPLICATION = new TypedEvent<>(Boolean.class); - public static final TypedEvent CHILL_MODE_STATUS = - new TypedEvent<>(Boolean.class); + public static final TypedEvent CHILL_MODE_STATUS = + new TypedEvent<>(ChillModeStatus.class); /** * Private Ctor. Never Constructed. 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 2b1022bbd33..46460d20e17 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 @@ -49,8 +49,6 @@ import org.apache.hadoop.hdds.scm.pipeline.RatisPipelineUtils; import org.apache.hadoop.hdds.scm.protocol.StorageContainerLocationProtocol; import org.apache.hadoop.hdds.scm.protocolPB.StorageContainerLocationProtocolPB; -import org.apache.hadoop.hdds.server.events.EventHandler; -import org.apache.hadoop.hdds.server.events.EventPublisher; import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.ipc.ProtobufRpcEngine; import org.apache.hadoop.ipc.RPC; @@ -95,7 +93,7 @@ * The RPC server that listens to requests from clients. */ public class SCMClientProtocolServer implements - StorageContainerLocationProtocol, EventHandler, Auditor { + StorageContainerLocationProtocol, Auditor { private static final Logger LOG = LoggerFactory.getLogger(SCMClientProtocolServer.class); private static final AuditLogger AUDIT = @@ -496,14 +494,6 @@ public StorageContainerManager getScm() { return scm; } - /** - * Set chill mode status based on SCMEvents.CHILL_MODE_STATUS event. - */ - @Override - public void onMessage(Boolean inChillMode, EventPublisher publisher) { - chillModePrecheck.setInChillMode(inChillMode); - } - /** * Set chill mode status based on . */ @@ -561,4 +551,13 @@ public AuditMessage buildAuditMessageForFailure(AuditAction op, Map { private static EventQueue eventQueue; private int numContainerPerOwnerInPipeline; private OzoneConfiguration conf; + private ChillModeStatus chillModeStatus = new ChillModeStatus(false); @Rule public ExpectedException thrown = ExpectedException.none(); @@ -101,7 +103,7 @@ public void setUp() throws Exception { eventQueue = new EventQueue(); eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS, - (BlockManagerImpl) scm.getScmBlockManager()); + scm.getChillModeHandler()); eventQueue.addHandler(SCMEvents.START_REPLICATION, this); CloseContainerEventHandler closeContainerHandler = new CloseContainerEventHandler(pipelineManager, mapping); @@ -123,7 +125,7 @@ public void cleanup() throws IOException { @Test public void testAllocateBlock() throws Exception { - eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false); + eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, chillModeStatus); GenericTestUtils.waitFor(() -> { return !blockManager.isScmInChillMode(); }, 10, 1000 * 5); @@ -134,7 +136,7 @@ public void testAllocateBlock() throws Exception { @Test public void testAllocateOversizedBlock() throws Exception { - eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false); + eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, chillModeStatus); GenericTestUtils.waitFor(() -> { return !blockManager.isScmInChillMode(); }, 10, 1000 * 5); @@ -147,7 +149,8 @@ public void testAllocateOversizedBlock() throws Exception { @Test public void testAllocateBlockFailureInChillMode() throws Exception { - eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, true); + eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, + new ChillModeStatus(true)); GenericTestUtils.waitFor(() -> { return blockManager.isScmInChillMode(); }, 10, 1000 * 5); @@ -161,7 +164,7 @@ public void testAllocateBlockFailureInChillMode() throws Exception { @Test public void testAllocateBlockSucInChillMode() throws Exception { // Test2: Exit chill mode and then try allocateBock again. - eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false); + eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, chillModeStatus); GenericTestUtils.waitFor(() -> { return !blockManager.isScmInChillMode(); }, 10, 1000 * 5); @@ -172,7 +175,7 @@ public void testAllocateBlockSucInChillMode() throws Exception { @Test(timeout = 10000) public void testMultipleBlockAllocation() throws IOException, TimeoutException, InterruptedException { - eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false); + eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, chillModeStatus); GenericTestUtils .waitFor(() -> !blockManager.isScmInChillMode(), 10, 1000 * 5); @@ -214,7 +217,7 @@ private boolean verifyNumberOfContainersInPipelines( @Test(timeout = 10000) public void testMultipleBlockAllocationWithClosedContainer() throws IOException, TimeoutException, InterruptedException { - eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false); + eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, chillModeStatus); GenericTestUtils .waitFor(() -> !blockManager.isScmInChillMode(), 10, 1000 * 5); @@ -266,7 +269,7 @@ public void testMultipleBlockAllocationWithClosedContainer() @Test(timeout = 10000) public void testBlockAllocationWithNoAvailablePipelines() throws IOException, TimeoutException, InterruptedException { - eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false); + eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, chillModeStatus); GenericTestUtils .waitFor(() -> !blockManager.isScmInChillMode(), 10, 1000 * 5); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestChillModeHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestChillModeHandler.java new file mode 100644 index 00000000000..22a3907a7b5 --- /dev/null +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestChillModeHandler.java @@ -0,0 +1,103 @@ +/** + * 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.hdds.scm.chillmode; + +import org.apache.hadoop.hdds.HddsConfigKeys; +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.scm.block.BlockManager; +import org.apache.hadoop.hdds.scm.block.BlockManagerImpl; +import org.apache.hadoop.hdds.scm.container.replication.ReplicationActivityStatus; +import org.apache.hadoop.hdds.scm.events.SCMEvents; +import org.apache.hadoop.hdds.scm.server.SCMClientProtocolServer; +import org.apache.hadoop.hdds.server.events.EventQueue; +import org.apache.hadoop.test.GenericTestUtils; +import org.junit.Assert; +import org.junit.Test; +import org.mockito.Mockito; + +/** + * Tests ChillModeHandler behavior. + */ +public class TestChillModeHandler { + + + private OzoneConfiguration configuration; + private SCMClientProtocolServer scmClientProtocolServer; + private ReplicationActivityStatus replicationActivityStatus; + private BlockManager blockManager; + private ChillModeHandler chillModeHandler; + private EventQueue eventQueue; + private SCMChillModeManager.ChillModeStatus chillModeStatus; + + public void setup(boolean enabled) { + configuration = new OzoneConfiguration(); + configuration.setBoolean(HddsConfigKeys.HDDS_SCM_CHILLMODE_ENABLED, + enabled); + configuration.set(HddsConfigKeys.HDDS_SCM_WAIT_TIME_AFTER_CHILL_MODE_EXIT, + "3s"); + scmClientProtocolServer = + Mockito.mock(SCMClientProtocolServer.class); + replicationActivityStatus = + new ReplicationActivityStatus(); + blockManager = Mockito.mock(BlockManagerImpl.class); + chillModeHandler = + new ChillModeHandler(configuration, scmClientProtocolServer, + blockManager, replicationActivityStatus); + + + eventQueue = new EventQueue(); + eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS, chillModeHandler); + chillModeStatus = new SCMChillModeManager.ChillModeStatus(false); + + } + + @Test + public void testChillModeHandlerWithChillModeEnabled() throws Exception { + setup(true); + + Assert.assertTrue(chillModeHandler.getChillModeStatus()); + + eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, chillModeStatus); + + GenericTestUtils.waitFor(() -> !chillModeHandler.getChillModeStatus(), + 1000, 5000); + + Assert.assertFalse(scmClientProtocolServer.getChillModeStatus()); + Assert.assertFalse(((BlockManagerImpl) blockManager).isScmInChillMode()); + GenericTestUtils.waitFor(() -> + replicationActivityStatus.isReplicationEnabled(), 1000, 5000); + } + + + @Test + public void testChillModeHandlerWithChillModeDisbaled() throws Exception{ + + setup(false); + + Assert.assertFalse(chillModeHandler.getChillModeStatus()); + + eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, chillModeStatus); + + Assert.assertFalse(chillModeHandler.getChillModeStatus()); + Assert.assertFalse(scmClientProtocolServer.getChillModeStatus()); + Assert.assertFalse(((BlockManagerImpl) blockManager).isScmInChillMode()); + GenericTestUtils.waitFor(() -> + replicationActivityStatus.isReplicationEnabled(), 1000, 5000); + } +} diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationActivityStatus.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationActivityStatus.java index a4615fc1a7b..9019792f8a5 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationActivityStatus.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationActivityStatus.java @@ -21,11 +21,20 @@ import static org.junit.Assert.*; import java.util.concurrent.TimeoutException; + +import org.apache.hadoop.hdds.HddsConfigKeys; +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.scm.block.BlockManager; +import org.apache.hadoop.hdds.scm.block.BlockManagerImpl; +import org.apache.hadoop.hdds.scm.chillmode.ChillModeHandler; +import org.apache.hadoop.hdds.scm.chillmode.SCMChillModeManager; import org.apache.hadoop.hdds.scm.events.SCMEvents; +import org.apache.hadoop.hdds.scm.server.SCMClientProtocolServer; import org.apache.hadoop.hdds.server.events.EventQueue; import org.apache.hadoop.test.GenericTestUtils; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.Mockito; /** * Tests for ReplicationActivityStatus. @@ -39,10 +48,19 @@ public class TestReplicationActivityStatus { public static void setup() { eventQueue = new EventQueue(); replicationActivityStatus = new ReplicationActivityStatus(); - eventQueue.addHandler(SCMEvents.START_REPLICATION, - replicationActivityStatus.getReplicationStatusListener()); - eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS, - replicationActivityStatus.getChillModeStatusListener()); + + OzoneConfiguration ozoneConfiguration = new OzoneConfiguration(); + ozoneConfiguration.set(HddsConfigKeys. + HDDS_SCM_WAIT_TIME_AFTER_CHILL_MODE_EXIT, "3s"); + + SCMClientProtocolServer scmClientProtocolServer = + Mockito.mock(SCMClientProtocolServer.class); + BlockManager blockManager = Mockito.mock(BlockManagerImpl.class); + ChillModeHandler chillModeHandler = + new ChillModeHandler(ozoneConfiguration, scmClientProtocolServer, + blockManager, replicationActivityStatus); + eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS, chillModeHandler); + } @Test @@ -50,11 +68,13 @@ public void testReplicationStatusForChillMode() throws TimeoutException, InterruptedException { assertFalse(replicationActivityStatus.isReplicationEnabled()); // In chill mode replication process should be stopped. - eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, true); + eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, + new SCMChillModeManager.ChillModeStatus(true)); assertFalse(replicationActivityStatus.isReplicationEnabled()); // Replication should be enabled when chill mode if off. - eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false); + eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, + new SCMChillModeManager.ChillModeStatus(false)); GenericTestUtils.waitFor(() -> { return replicationActivityStatus.isReplicationEnabled(); }, 10, 1000*5); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java index 4b2001848b1..1846b0c4b8a 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java @@ -21,6 +21,10 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType; +import org.apache.hadoop.hdds.scm.block.BlockManager; +import org.apache.hadoop.hdds.scm.block.BlockManagerImpl; +import org.apache.hadoop.hdds.scm.chillmode.ChillModeHandler; +import org.apache.hadoop.hdds.scm.container.replication.ReplicationActivityStatus; import org.apache.hadoop.hdds.scm.events.SCMEvents; import org.apache.hadoop.hdds.scm.exceptions.SCMException; import org.apache.hadoop.hdds.server.events.EventQueue; @@ -28,6 +32,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.mockito.Mockito; /** * Test class for @{@link SCMClientProtocolServer}. @@ -42,7 +47,12 @@ public void setUp() throws Exception { config = new OzoneConfiguration(); eventQueue = new EventQueue(); scmClientProtocolServer = new SCMClientProtocolServer(config, null); - eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS, scmClientProtocolServer); + BlockManager blockManager = Mockito.mock(BlockManagerImpl.class); + ReplicationActivityStatus replicationActivityStatus = + Mockito.mock(ReplicationActivityStatus.class); + ChillModeHandler chillModeHandler = new ChillModeHandler(config, + scmClientProtocolServer, blockManager, replicationActivityStatus); + eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS, chillModeHandler); } @After diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmChillMode.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmChillMode.java index 8e11a665070..fbac88256dc 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmChillMode.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmChillMode.java @@ -57,6 +57,7 @@ import org.junit.rules.Timeout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import sun.rmi.runtime.Log; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -335,7 +336,8 @@ public void testSCMChillModeRestrictedOp() throws Exception { assertFalse((scm.getClientProtocolServer()).getChillModeStatus()); final List containers = scm.getContainerManager() .getContainers(); - scm.getEventQueue().fireEvent(SCMEvents.CHILL_MODE_STATUS, true); + scm.getEventQueue().fireEvent(SCMEvents.CHILL_MODE_STATUS, + new SCMChillModeManager.ChillModeStatus(true)); GenericTestUtils.waitFor(() -> { return clientProtocolServer.getChillModeStatus(); }, 50, 1000 * 5); diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkOzoneManager.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkOzoneManager.java index 12932f7a41d..6188845cefe 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkOzoneManager.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkOzoneManager.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType; +import org.apache.hadoop.hdds.scm.chillmode.SCMChillModeManager; import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList; import org.apache.hadoop.hdds.scm.events.SCMEvents; import org.apache.hadoop.hdds.scm.pipeline.Pipeline; @@ -93,7 +94,8 @@ public static void initialize() .getPipelines(ReplicationType.RATIS, ReplicationFactor.THREE)) { pipelineManager.openPipeline(pipeline.getId()); } - scm.getEventQueue().fireEvent(SCMEvents.CHILL_MODE_STATUS, false); + scm.getEventQueue().fireEvent(SCMEvents.CHILL_MODE_STATUS, + new SCMChillModeManager.ChillModeStatus(false)); Thread.sleep(1000); // prepare OM diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkSCM.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkSCM.java index 7750d09a437..1d170308c66 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkSCM.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkSCM.java @@ -28,6 +28,7 @@ import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType; import org.apache.hadoop.hdds.scm.block.BlockManager; +import org.apache.hadoop.hdds.scm.chillmode.SCMChillModeManager; import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList; import org.apache.hadoop.hdds.scm.events.SCMEvents; import org.apache.hadoop.hdds.scm.pipeline.Pipeline; @@ -84,7 +85,8 @@ public static void initialize() .getPipelines(ReplicationType.RATIS, ReplicationFactor.THREE)) { pipelineManager.openPipeline(pipeline.getId()); } - scm.getEventQueue().fireEvent(SCMEvents.CHILL_MODE_STATUS, false); + scm.getEventQueue().fireEvent(SCMEvents.CHILL_MODE_STATUS, + new SCMChillModeManager.ChillModeStatus(false)); Thread.sleep(1000); } } finally {