mirror of https://github.com/apache/activemq.git
Implements https://issues.apache.org/jira/browse/AMQ-5458 - Lets make sure we register the Test mbean when in slave mode.
This commit is contained in:
parent
f4149c0a46
commit
4e3499e41b
|
@ -293,7 +293,7 @@ class LevelDBStore extends LockableServiceSupport with BrokerServiceAware with P
|
|||
try {
|
||||
AnnotatedMBean.registerMBean(brokerService.getManagementContext, new LevelDBStoreView(this), objectName)
|
||||
if( java.lang.Boolean.getBoolean("org.apache.activemq.leveldb.test") ) {
|
||||
val name = new ObjectName(objectName.toString + ",test=test")
|
||||
val name = new ObjectName(objectName.toString + ",view=Test")
|
||||
AnnotatedMBean.registerMBean(brokerService.getManagementContext, new LevelDBStoreTest(this), name)
|
||||
}
|
||||
} catch {
|
||||
|
@ -353,7 +353,7 @@ class LevelDBStore extends LockableServiceSupport with BrokerServiceAware with P
|
|||
if(brokerService!=null && brokerService.isUseJmx){
|
||||
brokerService.getManagementContext().unregisterMBean(objectName);
|
||||
if( java.lang.Boolean.getBoolean("org.apache.activemq.leveldb.test") )
|
||||
brokerService.getManagementContext().unregisterMBean(new ObjectName(objectName.toString+",test=test"));
|
||||
brokerService.getManagementContext().unregisterMBean(new ObjectName(objectName.toString+",view=Test"));
|
||||
}
|
||||
info("Stopped "+this)
|
||||
}
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
*/
|
||||
package org.apache.activemq.leveldb.replicated
|
||||
|
||||
import org.apache.activemq.leveldb.{LevelDBClient, LevelDBStore}
|
||||
import org.apache.activemq.leveldb.{LevelDBStoreTest, LevelDBClient, LevelDBStore}
|
||||
import org.apache.activemq.util.ServiceStopper
|
||||
import java.util
|
||||
import org.fusesource.hawtdispatch._
|
||||
|
@ -30,6 +30,8 @@ import FileSupport._
|
|||
import java.io.{IOException, RandomAccessFile, File}
|
||||
import scala.beans.BeanProperty
|
||||
import java.util.concurrent.{CountDownLatch, TimeUnit}
|
||||
import javax.management.ObjectName
|
||||
import org.apache.activemq.broker.jmx.AnnotatedMBean
|
||||
|
||||
object SlaveLevelDBStore extends Log
|
||||
|
||||
|
@ -79,10 +81,18 @@ class SlaveLevelDBStore extends LevelDBStore with ReplicatedLevelDBStoreTrait {
|
|||
db.client.dirtyIndexFile.recursiveDelete
|
||||
db.client.plistIndexFile.recursiveDelete
|
||||
start_slave_connections
|
||||
|
||||
if( java.lang.Boolean.getBoolean("org.apache.activemq.leveldb.test") ) {
|
||||
val name = new ObjectName(objectName.toString + ",view=Test")
|
||||
AnnotatedMBean.registerMBean(brokerService.getManagementContext, new LevelDBStoreTest(this), name)
|
||||
}
|
||||
}
|
||||
|
||||
var stopped = false
|
||||
override def doStop(stopper: ServiceStopper) = {
|
||||
if( java.lang.Boolean.getBoolean("org.apache.activemq.leveldb.test") )
|
||||
brokerService.getManagementContext().unregisterMBean(new ObjectName(objectName.toString+",view=Test"));
|
||||
|
||||
val latch = new CountDownLatch(1)
|
||||
stop_connections(^{
|
||||
latch.countDown
|
||||
|
|
Loading…
Reference in New Issue