[jboss-cvs] JBoss Messaging SVN: r6124 - in trunk: src/main/org/jboss/messaging/core/management/impl and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 20 06:49:26 EDT 2009
Author: jmesnil
Date: 2009-03-20 06:49:25 -0400 (Fri, 20 Mar 2009)
New Revision: 6124
Modified:
trunk/src/main/org/jboss/messaging/core/management/BridgeControlMBean.java
trunk/src/main/org/jboss/messaging/core/management/MessagingComponentControlMBean.java
trunk/src/main/org/jboss/messaging/core/management/PairsInfo.java
trunk/src/main/org/jboss/messaging/core/management/QueueControlMBean.java
trunk/src/main/org/jboss/messaging/core/management/impl/BridgeControl.java
trunk/src/main/org/jboss/messaging/core/management/impl/QueueControl.java
trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareQueueControlWrapper.java
trunk/src/main/org/jboss/messaging/core/messagecounter/MessageCounterManager.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlUsingCoreTest.java
Log:
management integration tests
Modified: trunk/src/main/org/jboss/messaging/core/management/BridgeControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/BridgeControlMBean.java 2009-03-20 10:48:20 UTC (rev 6123)
+++ trunk/src/main/org/jboss/messaging/core/management/BridgeControlMBean.java 2009-03-20 10:49:25 UTC (rev 6124)
@@ -22,22 +22,16 @@
package org.jboss.messaging.core.management;
-import javax.management.openmbean.TabularData;
+import javax.management.openmbean.CompositeData;
/**
- * A AcceptorMBean
+ * A BridgeControlMBean
*
* @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
*
*/
-public interface BridgeControlMBean
+public interface BridgeControlMBean extends MessagingComponentControlMBean
{
- boolean isStarted();
-
- void start() throws Exception;
-
- void stop() throws Exception;
-
String getName();
String getQueueName();
@@ -48,7 +42,7 @@
String getTransformerClassName();
- TabularData getConnectorPair();
+ CompositeData getConnectorPair() throws Exception;
String getDiscoveryGroupName();
@@ -59,4 +53,6 @@
int getMaxRetriesBeforeFailover();
int getMaxRetriesAfterFailover();
+
+ boolean isUseDuplicateDetection();
}
Modified: trunk/src/main/org/jboss/messaging/core/management/MessagingComponentControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/MessagingComponentControlMBean.java 2009-03-20 10:48:20 UTC (rev 6123)
+++ trunk/src/main/org/jboss/messaging/core/management/MessagingComponentControlMBean.java 2009-03-20 10:49:25 UTC (rev 6124)
@@ -26,11 +26,7 @@
/**
* A MessagingComponentControlMBean
*
- * @author jmesnil
- *
- * Created 15 dec. 2008 11:31:28
- *
- *
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
*/
public interface MessagingComponentControlMBean
{
Modified: trunk/src/main/org/jboss/messaging/core/management/PairsInfo.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/PairsInfo.java 2009-03-20 10:48:20 UTC (rev 6123)
+++ trunk/src/main/org/jboss/messaging/core/management/PairsInfo.java 2009-03-20 10:49:25 UTC (rev 6124)
@@ -87,12 +87,9 @@
return pairs;
}
- public static TabularData toTabularData(Pair<String, String> pair)
+ public static CompositeData toCompositeData(Pair<String, String> pair) throws OpenDataException
{
- List<Pair<String, String>> list = new ArrayList<Pair<String, String>>();
- list.add(pair);
- PairsInfo info = new PairsInfo(list);
- return info.toTabularData();
+ return new CompositeDataSupport(ROW_TYPE, new String[] { "a", "b" }, new Object[] { pair.a, pair.b });
}
public static TabularData toTabularData(List<Pair<String, String>> pairs)
@@ -125,7 +122,7 @@
TabularDataSupport data = new TabularDataSupport(TABULAR_TYPE);
for (Pair<String, String> pair : pairs)
{
- data.put(new CompositeDataSupport(ROW_TYPE, new String[] { "a", "b" }, new Object[] { pair.a, pair.b }));
+ data.put(toCompositeData(pair));
}
return data;
}
Modified: trunk/src/main/org/jboss/messaging/core/management/QueueControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/QueueControlMBean.java 2009-03-20 10:48:20 UTC (rev 6123)
+++ trunk/src/main/org/jboss/messaging/core/management/QueueControlMBean.java 2009-03-20 10:49:25 UTC (rev 6124)
@@ -145,9 +145,12 @@
CompositeData listMessageCounter() throws Exception;
+ void resetMessageCounter() throws Exception;
+
String listMessageCounterAsHTML() throws Exception;
TabularData listMessageCounterHistory() throws Exception;
String listMessageCounterHistoryAsHTML() throws Exception;
+
}
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/BridgeControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/BridgeControl.java 2009-03-20 10:48:20 UTC (rev 6123)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/BridgeControl.java 2009-03-20 10:49:25 UTC (rev 6124)
@@ -22,6 +22,8 @@
package org.jboss.messaging.core.management.impl;
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.OpenDataException;
import javax.management.openmbean.TabularData;
import org.jboss.messaging.core.config.cluster.BridgeConfiguration;
@@ -59,9 +61,9 @@
// BridgeControlMBean implementation ---------------------------
- public TabularData getConnectorPair()
+ public CompositeData getConnectorPair() throws Exception
{
- return PairsInfo.toTabularData(configuration.getConnectorPair());
+ return PairsInfo.toCompositeData(configuration.getConnectorPair());
}
public String getForwardingAddress()
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/QueueControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/QueueControl.java 2009-03-20 10:48:20 UTC (rev 6123)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/QueueControl.java 2009-03-20 10:49:25 UTC (rev 6124)
@@ -374,6 +374,11 @@
{
return MessageCounterInfo.toCompositeData(counter);
}
+
+ public void resetMessageCounter()
+ {
+ counter.resetCounter();
+ }
public String listMessageCounterAsHTML()
{
Modified: trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareQueueControlWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareQueueControlWrapper.java 2009-03-20 10:48:20 UTC (rev 6123)
+++ trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareQueueControlWrapper.java 2009-03-20 10:49:25 UTC (rev 6124)
@@ -151,6 +151,11 @@
{
return localQueueControl.listMessageCounter();
}
+
+ public void resetMessageCounter() throws Exception
+ {
+ localQueueControl.resetMessageCounter();
+ }
public String listMessageCounterAsHTML() throws Exception
{
Modified: trunk/src/main/org/jboss/messaging/core/messagecounter/MessageCounterManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/messagecounter/MessageCounterManager.java 2009-03-20 10:48:20 UTC (rev 6123)
+++ trunk/src/main/org/jboss/messaging/core/messagecounter/MessageCounterManager.java 2009-03-20 10:49:25 UTC (rev 6124)
@@ -49,4 +49,5 @@
int getMaxDayCount();
void setMaxDayCount(int count);
+
}
\ No newline at end of file
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-03-20 10:48:20 UTC (rev 6123)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-03-20 10:49:25 UTC (rev 6124)
@@ -47,6 +47,7 @@
import org.jboss.messaging.core.management.MessagingServerControlMBean;
import org.jboss.messaging.core.management.QueueControlMBean;
import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.messagecounter.impl.MessageCounterManagerImpl;
import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
import org.jboss.messaging.core.server.Messaging;
@@ -970,7 +971,6 @@
public void testListMessageCounter() throws Exception
{
- long counterPeriod = 1000;
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
@@ -979,7 +979,7 @@
MessagingServerControlMBean serverControl = createMessagingServerControl(mbeanServer);
serverControl.enableMessageCounters();
- serverControl.setMessageCounterSamplePeriod(counterPeriod);
+ serverControl.setMessageCounterSamplePeriod(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD);
CompositeData compositeData = queueControl.listMessageCounter();
MessageCounterInfo info = MessageCounterInfo.from(compositeData);
@@ -989,20 +989,85 @@
ClientProducer producer = session.createProducer(address);
producer.send(session.createClientMessage(false));
- Thread.sleep(counterPeriod * 2);
+ Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
compositeData = queueControl.listMessageCounter();
info = MessageCounterInfo.from(compositeData);
assertEquals(1, info.getDepth());
+ assertEquals(1, info.getDepthDelta());
assertEquals(1, info.getCount());
+ assertEquals(1, info.getCountDelta());
+ producer.send(session.createClientMessage(false));
+
+ Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
+ compositeData = queueControl.listMessageCounter();
+ info = MessageCounterInfo.from(compositeData);
+ assertEquals(2, info.getDepth());
+ assertEquals(1, info.getDepthDelta());
+ assertEquals(2, info.getCount());
+ assertEquals(1, info.getCountDelta());
+
+ consumeMessages(2, session, queue);
+
+ Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
+ compositeData = queueControl.listMessageCounter();
+ info = MessageCounterInfo.from(compositeData);
+ assertEquals(0, info.getDepth());
+ assertEquals(-2, info.getDepthDelta());
+ assertEquals(2, info.getCount());
+ assertEquals(0, info.getCountDelta());
+
+ session.deleteQueue(queue);
+ }
+
+ public void testResetMessageCounter() throws Exception
+ {
+ SimpleString address = randomSimpleString();
+ SimpleString queue = randomSimpleString();
+
+ session.createQueue(address, queue, null, false, false);
+ QueueControlMBean queueControl = createManagementControl(address, queue);
+
+ MessagingServerControlMBean serverControl = createMessagingServerControl(mbeanServer);
+ serverControl.enableMessageCounters();
+ serverControl.setMessageCounterSamplePeriod(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD);
+
+ CompositeData compositeData = queueControl.listMessageCounter();
+ MessageCounterInfo info = MessageCounterInfo.from(compositeData);
+ assertEquals(0, info.getDepth());
+ assertEquals(0, info.getCount());
+
+ ClientProducer producer = session.createProducer(address);
+ producer.send(session.createClientMessage(false));
+
+ Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
+ compositeData = queueControl.listMessageCounter();
+ info = MessageCounterInfo.from(compositeData);
+ assertEquals(1, info.getDepth());
+ assertEquals(1, info.getDepthDelta());
+ assertEquals(1, info.getCount());
+ assertEquals(1, info.getCountDelta());
+
consumeMessages(1, session, queue);
- Thread.sleep(counterPeriod * 2);
+ Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
compositeData = queueControl.listMessageCounter();
info = MessageCounterInfo.from(compositeData);
assertEquals(0, info.getDepth());
+ assertEquals(-1, info.getDepthDelta());
assertEquals(1, info.getCount());
+ assertEquals(0, info.getCountDelta());
+ queueControl.resetMessageCounter();
+
+ Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
+ compositeData = queueControl.listMessageCounter();
+ info = MessageCounterInfo.from(compositeData);
+ assertEquals(0, info.getDepth());
+ assertEquals(0, info.getDepthDelta());
+ assertEquals(0, info.getCount());
+ assertEquals(0, info.getCountDelta());
+
session.deleteQueue(queue);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlUsingCoreTest.java 2009-03-20 10:48:20 UTC (rev 6123)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlUsingCoreTest.java 2009-03-20 10:49:25 UTC (rev 6124)
@@ -159,6 +159,11 @@
return (CompositeData)proxy.invokeOperation("listMessageCounter");
}
+ public void resetMessageCounter() throws Exception
+ {
+ proxy.invokeOperation("resetMessageCounter");
+ }
+
public String listMessageCounterAsHTML() throws Exception
{
return (String)proxy.invokeOperation("listMessageCounterAsHTML");
More information about the jboss-cvs-commits
mailing list