This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 0b1afd35dc78597531d6e0499c045ac8b57f9db0 Author: Clebert Suconic <[email protected]> AuthorDate: Tue Nov 26 09:04:20 2019 -0500 ARTEMIS-2421 Using ActiveMQScheduledComponent --- .../artemis/cli/commands/tools/PrintData.java | 8 ++---- .../core/server/ActiveMQScheduledComponent.java | 22 +++++++++++++++ .../core/server/impl/FileLockNodeManager.java | 33 +++++++++++++++------- .../tests/util/ColocatedActiveMQServer.java | 3 +- .../integration/cluster/NodeManagerAction.java | 3 +- .../integration/cluster/RealNodeManagerTest.java | 3 +- .../cluster/failover/NettyFailoverTest.java | 3 +- .../tests/unit/core/server/impl/FileLockTest.java | 3 +- 8 files changed, 53 insertions(+), 25 deletions(-) diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/PrintData.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/PrintData.java index 01fee3f..805f3c2 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/PrintData.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/PrintData.java @@ -26,8 +26,9 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledThreadPoolExecutor; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQBuffers; import org.apache.activemq.artemis.api.core.SimpleString; @@ -61,9 +62,6 @@ import org.apache.activemq.artemis.utils.ActiveMQThreadFactory; import org.apache.activemq.artemis.utils.ExecutorFactory; import org.apache.activemq.artemis.utils.actors.ArtemisExecutor; -import io.airlift.airline.Command; -import io.airlift.airline.Option; - @Command(name = "print", description = "Print data records information (WARNING: don't use while a production server is running)") public class PrintData extends DBOption { @@ -131,7 +129,7 @@ public class PrintData extends DBOption { if (serverLockFile.isFile()) { try { - FileLockNodeManager fileLock = new FileLockNodeManager(messagesDirectory, false, new ScheduledThreadPoolExecutor(1)); + FileLockNodeManager fileLock = new FileLockNodeManager(messagesDirectory, false); fileLock.start(); printBanner(out, "Server's ID=" + fileLock.getNodeId().toString()); fileLock.stop(); diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java index 0ca8255..2ccea9f 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java @@ -78,6 +78,28 @@ public abstract class ActiveMQScheduledComponent implements ActiveMQComponent, R /** * It creates a scheduled component that can trigger {@link #run()} with a fixed {@code checkPeriod} on a configured {@code executor}. * + * @param scheduledExecutorService the {@link ScheduledExecutorService} that periodically trigger {@link #run()} on the configured {@code executor} + * @param initialDelay the time to delay first execution + * @param checkPeriod the delay between the termination of one execution and the start of the next + * @param timeUnit the time unit of the {@code initialDelay} and {@code checkPeriod} parameters + * @param onDemand if {@code true} the task won't be scheduled on {@link #start()}, {@code false} otherwise + */ + public ActiveMQScheduledComponent(ScheduledExecutorService scheduledExecutorService, + long initialDelay, + long checkPeriod, + TimeUnit timeUnit, + boolean onDemand) { + this.executor = null; + this.scheduledExecutorService = scheduledExecutorService; + this.initialDelay = initialDelay; + this.period = checkPeriod; + this.timeUnit = timeUnit; + this.onDemand = onDemand; + } + + /** + * It creates a scheduled component that can trigger {@link #run()} with a fixed {@code checkPeriod} on a configured {@code executor}. + * * <p> * The component created will have {@code initialDelay} defaulted to {@code checkPeriod}. * diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileLockNodeManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileLockNodeManager.java index ebeb6a1..116b977 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileLockNodeManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileLockNodeManager.java @@ -26,13 +26,13 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.server.ActivateCallback; import org.apache.activemq.artemis.core.server.ActiveMQLockAcquisitionTimeoutException; +import org.apache.activemq.artemis.core.server.ActiveMQScheduledComponent; import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; import org.apache.activemq.artemis.core.server.NodeManager; import org.apache.activemq.artemis.utils.UUID; @@ -79,6 +79,11 @@ public class FileLockNodeManager extends NodeManager { this.scheduledPool = scheduledPool; } + public FileLockNodeManager(final File directory, boolean replicatedBackup) { + super(replicatedBackup, directory); + this.scheduledPool = null; + } + public FileLockNodeManager(final File directory, boolean replicatedBackup, long lockAcquisitionTimeout, ScheduledExecutorService scheduledPool) { super(replicatedBackup, directory); @@ -406,10 +411,9 @@ public class FileLockNodeManager extends NodeManager { private synchronized void startLockMonitoring() { logger.debug("Starting the lock monitor"); - if (scheduledLockMonitor == null) { - MonitorLock monitorLock = new MonitorLock(); - scheduledLockMonitor = scheduledPool.scheduleAtFixedRate(monitorLock, LOCK_MONITOR_TIMEOUT_MILLIES, - LOCK_MONITOR_TIMEOUT_MILLIES, TimeUnit.MILLISECONDS); + if (monitorLock == null) { + monitorLock = new MonitorLock(scheduledPool, LOCK_MONITOR_TIMEOUT_MILLIES, LOCK_MONITOR_TIMEOUT_MILLIES, TimeUnit.MILLISECONDS, false); + monitorLock.start(); } else { logger.debug("Lock monitor was already started"); } @@ -417,9 +421,9 @@ public class FileLockNodeManager extends NodeManager { private synchronized void stopLockMonitoring() { logger.debug("Stopping the lock monitor"); - if (scheduledLockMonitor != null) { - scheduledLockMonitor.cancel(true); - scheduledLockMonitor = null; + if (monitorLock != null) { + monitorLock.stop(); + monitorLock = null; } else { logger.debug("The lock monitor was already stopped"); } @@ -457,7 +461,7 @@ public class FileLockNodeManager extends NodeManager { protected final Set<LockListener> lockListeners = Collections.synchronizedSet(new HashSet<LockListener>()); - private ScheduledFuture<?> scheduledLockMonitor; + private MonitorLock monitorLock; public abstract class LockListener { protected abstract void lostLock() throws Exception; @@ -467,7 +471,16 @@ public class FileLockNodeManager extends NodeManager { } } - public class MonitorLock implements Runnable { + + public class MonitorLock extends ActiveMQScheduledComponent { + public MonitorLock(ScheduledExecutorService scheduledExecutorService, + long initialDelay, + long checkPeriod, + TimeUnit timeUnit, + boolean onDemand) { + super(scheduledExecutorService, initialDelay, checkPeriod, timeUnit, onDemand); + } + @Override public void run() { diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ColocatedActiveMQServer.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ColocatedActiveMQServer.java index d07ec6e..04759a7 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ColocatedActiveMQServer.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ColocatedActiveMQServer.java @@ -18,7 +18,6 @@ package org.apache.activemq.artemis.tests.util; import javax.management.MBeanServer; import java.io.File; -import java.util.concurrent.ScheduledThreadPoolExecutor; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.impl.FileConfiguration; @@ -66,7 +65,7 @@ public class ColocatedActiveMQServer extends ActiveMQServerImpl { @Override protected NodeManager createNodeManager(final File directory, boolean replicatingBackup) { if (replicatingBackup) { - return new FileLockNodeManager(directory, replicatingBackup, getConfiguration().getJournalLockAcquisitionTimeout(), new ScheduledThreadPoolExecutor(1)); + return new FileLockNodeManager(directory, replicatingBackup, getConfiguration().getJournalLockAcquisitionTimeout(), null); } else { if (backup) { return nodeManagerBackup; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerAction.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerAction.java index 511f9d3..8ade9ee 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerAction.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerAction.java @@ -17,7 +17,6 @@ package org.apache.activemq.artemis.tests.integration.cluster; import java.io.File; -import java.util.concurrent.ScheduledThreadPoolExecutor; import org.apache.activemq.artemis.core.server.NodeManager; import org.apache.activemq.artemis.core.server.impl.FileLockNodeManager; @@ -118,7 +117,7 @@ public class NodeManagerAction { } NodeManagerAction nodeManagerAction = new NodeManagerAction(work1); - FileLockNodeManager nodeManager = new FileLockNodeManager(new File("."), false, new ScheduledThreadPoolExecutor(1)); + FileLockNodeManager nodeManager = new FileLockNodeManager(new File("."), false); nodeManager.start(); try { nodeManagerAction.performWork(nodeManager); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/RealNodeManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/RealNodeManagerTest.java index 87acfa0..1dfe48b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/RealNodeManagerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/RealNodeManagerTest.java @@ -19,7 +19,6 @@ package org.apache.activemq.artemis.tests.integration.cluster; import java.io.File; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.ScheduledThreadPoolExecutor; import org.apache.activemq.artemis.core.server.NodeManager; import org.apache.activemq.artemis.core.server.impl.FileLockNodeManager; @@ -33,7 +32,7 @@ public class RealNodeManagerTest extends NodeManagerTest { @Test public void testId() throws Exception { - NodeManager nodeManager = new FileLockNodeManager(new File(getTemporaryDir()), false, new ScheduledThreadPoolExecutor(1)); + NodeManager nodeManager = new FileLockNodeManager(new File(getTemporaryDir()), false); nodeManager.start(); UUID id1 = nodeManager.getUUID(); nodeManager.stop(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverTest.java index 0171ee8..88549db 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverTest.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadFactory; import org.apache.activemq.artemis.api.core.TransportConfiguration; @@ -133,7 +132,7 @@ public class NettyFailoverTest extends FailoverTest { if (useSeparateLockFolder) { config.getNodeManagerLockLocation().mkdirs(); } - return new FileLockNodeManager(config.getNodeManagerLockLocation(), false, new ScheduledThreadPoolExecutor(1)); + return new FileLockNodeManager(config.getNodeManagerLockLocation(), false); default: throw new AssertionError("enum type not supported!"); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/FileLockTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/FileLockTest.java index 9ed8a26..8812793 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/FileLockTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/FileLockTest.java @@ -17,7 +17,6 @@ package org.apache.activemq.artemis.tests.unit.core.server.impl; import java.io.File; -import java.util.concurrent.ScheduledThreadPoolExecutor; import org.apache.activemq.artemis.core.server.impl.FileLockNodeManager; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; @@ -36,7 +35,7 @@ public class FileLockTest extends ActiveMQTestBase { @Test public void testNIOLock() throws Exception { - doTestLock(new FileLockNodeManager(getTestDirfile(), false, new ScheduledThreadPoolExecutor(1)), new FileLockNodeManager(getTestDirfile(), false, new ScheduledThreadPoolExecutor(1))); + doTestLock(new FileLockNodeManager(getTestDirfile(), false), new FileLockNodeManager(getTestDirfile(), false)); }
