From c1290511751248773ba3409a0e9b68d9eef7cc8b Mon Sep 17 00:00:00 2001 From: gtully Date: Mon, 27 Apr 2015 16:16:49 +0100 Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-5746 - separate out start from creation of scheduler store. test via Martyn Taylor with thanks. This closes #80 --- .../apache/activemq/broker/BrokerService.java | 27 ++-- .../jmx/JMXMasterSlaveSharedStoreTest.java | 135 ++++++++++++++++++ ...KahaDBSchedulerMissingJournalLogsTest.java | 1 + 3 files changed, 148 insertions(+), 15 deletions(-) create mode 100644 activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JMXMasterSlaveSharedStoreTest.java diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java index 7b0f98e19b..3eda490656 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java @@ -649,6 +649,18 @@ public class BrokerService implements Service { deleteAllMessages(); } getPersistenceAdapter().start(); + + getJobSchedulerStore(); + if (jobSchedulerStore != null) { + try { + jobSchedulerStore.start(); + } catch (Exception e) { + RuntimeException exception = new RuntimeException( + "Failed to start job scheduler store: " + jobSchedulerStore, e); + LOG.error(exception.getLocalizedMessage(), e); + throw exception; + } + } } private void startBroker(boolean async) throws Exception { @@ -1861,11 +1873,6 @@ public class BrokerService implements Service { if (!isPersistent()) { this.jobSchedulerStore = new InMemoryJobSchedulerStore(); configureService(jobSchedulerStore); - try { - jobSchedulerStore.start(); - } catch (Exception e) { - throw new RuntimeException(e); - } return this.jobSchedulerStore; } @@ -1875,7 +1882,6 @@ public class BrokerService implements Service { this.jobSchedulerStore = pa.createJobSchedulerStore(); jobSchedulerStore.setDirectory(getSchedulerDirectoryFile()); configureService(jobSchedulerStore); - jobSchedulerStore.start(); return this.jobSchedulerStore; } } catch (IOException e) { @@ -1906,7 +1912,6 @@ public class BrokerService implements Service { jobSchedulerStore = adaptor.createJobSchedulerStore(); jobSchedulerStore.setDirectory(getSchedulerDirectoryFile()); configureService(jobSchedulerStore); - jobSchedulerStore.start(); LOG.info("JobScheduler using directory: {}", getSchedulerDirectoryFile()); } catch (Exception e) { throw new RuntimeException(e); @@ -1918,14 +1923,6 @@ public class BrokerService implements Service { public void setJobSchedulerStore(JobSchedulerStore jobSchedulerStore) { this.jobSchedulerStore = jobSchedulerStore; configureService(jobSchedulerStore); - try { - jobSchedulerStore.start(); - } catch (Exception e) { - RuntimeException exception = new RuntimeException( - "Failed to start provided job scheduler store: " + jobSchedulerStore, e); - LOG.error(exception.getLocalizedMessage(), e); - throw exception; - } } // diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JMXMasterSlaveSharedStoreTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JMXMasterSlaveSharedStoreTest.java new file mode 100644 index 0000000000..e927ecf450 --- /dev/null +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JMXMasterSlaveSharedStoreTest.java @@ -0,0 +1,135 @@ +/** + * 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.activemq.broker.jmx; + +import java.io.File; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +import org.apache.activemq.TestSupport; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter; +import org.apache.activemq.xbean.XBeanBrokerService; +import org.junit.Test; + +public class JMXMasterSlaveSharedStoreTest extends TestSupport { + protected XBeanBrokerService master; + protected XBeanBrokerService slave; + protected AtomicReference slaveAtomicReference = new AtomicReference(); + protected CountDownLatch slaveStarted = new CountDownLatch(1); + protected PersistenceAdapter persistenceAdapter; + protected File messageStore; + protected File schedulerStoreFile; + + @Override + protected void setUp() throws Exception { + setMaxTestTime(TimeUnit.MINUTES.toMillis(10)); + setAutoFail(true); + + messageStore = new File("target/activemq-data/kahadb/JMXMasterSlaveSharedStoreTest"); + schedulerStoreFile = new File("target/activemq-data/scheduler/JMXMasterSlaveSharedStoreTest/"); + + if (System.getProperty("basedir") == null) { + File file = new File("."); + System.setProperty("basedir", file.getAbsolutePath()); + } + + createMaster(); + + // Give master a chance to aquire lock. + Thread.sleep(1000); + createSlave(); + + super.setUp(); + } + + @Override + protected void tearDown() throws Exception { + if (slave != null) { + slave.stop(); + } + + if (master != null) { + master.stop(); + } + } + + protected void createMaster() throws Exception { + master = createXBeanBrokerService("master"); + master.afterPropertiesSet(); + } + + protected void createSlave() throws Exception { + // Start the Brokers async since starting them up could be a blocking operation.. + new Thread(new Runnable() { + public void run() { + try { + slave = createXBeanBrokerService("slave"); + slave.afterPropertiesSet(); + slaveAtomicReference.set(slave); + slaveStarted.countDown(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + }).start(); + + // Wait for slave to be set as new broker. + Thread.sleep(100); + } + + private XBeanBrokerService createXBeanBrokerService(String name) throws Exception { + String[] connectors = {"tcp://localhost:" + 0}; + + // Setup messaging store + PersistenceAdapter persistenceAdapter = new KahaDBPersistenceAdapter(); + persistenceAdapter.setDirectory(messageStore); + + XBeanBrokerService broker = new XBeanBrokerService(); + broker.setUseJmx(true); + broker.setBrokerName(name); + broker.setPersistenceAdapter(persistenceAdapter); + broker.setTransportConnectorURIs(connectors); + broker.setSchedulerSupport(true); + broker.setSchedulerDirectoryFile(schedulerStoreFile); + broker.getManagementContext().setCreateConnector(false); + return broker; + } + + private String getXBeanBrokerServiceMBeanName(String brokerName) { + return "org.apache.activemq:type=Broker,brokerName=" + brokerName; + } + + + @Test + public void testJMXMBeanIsRegisteredForSlave() throws Exception { + assertFalse(master.isSlave()); + assertTrue(slave.isSlave()); + + // Expected MBeans: + ObjectName masterMBeanName = new ObjectName(getXBeanBrokerServiceMBeanName("master")); + ObjectName slaveMBeanName = new ObjectName(getXBeanBrokerServiceMBeanName("slave")); + + MBeanServerConnection connection = master.getManagementContext().getMBeanServer(); + assertFalse(connection.queryMBeans(masterMBeanName, null).isEmpty()); + assertFalse(connection.queryMBeans(slaveMBeanName, null).isEmpty()); + } +} \ No newline at end of file diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/KahaDBSchedulerMissingJournalLogsTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/KahaDBSchedulerMissingJournalLogsTest.java index 30da10dfb7..eb448b472e 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/KahaDBSchedulerMissingJournalLogsTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/KahaDBSchedulerMissingJournalLogsTest.java @@ -119,6 +119,7 @@ public class KahaDBSchedulerMissingJournalLogsTest { try { createBroker(); + broker.start(); fail("Should not start when logs are missing."); } catch (Exception e) { }