[jboss-cvs] JBoss Messaging SVN: r7726 - in trunk: src/main/org/jboss/messaging/core/management and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 14 09:58:11 EDT 2009
Author: jmesnil
Date: 2009-08-14 09:58:11 -0400 (Fri, 14 Aug 2009)
New Revision: 7726
Modified:
trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/core/management/MessagingServerControl.java
trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControlImpl.java
trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java
trunk/src/main/org/jboss/messaging/core/paging/PagingManager.java
trunk/src/main/org/jboss/messaging/core/paging/PagingStore.java
trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/ChannelImpl.java
trunk/src/main/org/jboss/messaging/core/server/MessagingServer.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerInfo.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlUsingCoreTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueDeployerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
Log:
JBMESSAGING-1711: Add periodic dump of server info for debugging
* added memory info for each page store
* interval default is -1. Value must be -1 or >0
* removed pagingTotalMemory attribute from MessagingServerControl...
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2009-08-14 13:08:07 UTC (rev 7725)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2009-08-14 13:58:11 UTC (rev 7726)
@@ -153,7 +153,7 @@
public static final int DEFAULT_BRIDGE_RECONNECT_ATTEMPTS = -1;
- public static final long DEFAULT_SERVER_DUMP_INTERVAL = 0;
+ public static final long DEFAULT_SERVER_DUMP_INTERVAL = -1;
// Attributes -----------------------------------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2009-08-14 13:08:07 UTC (rev 7725)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2009-08-14 13:58:11 UTC (rev 7726)
@@ -331,7 +331,7 @@
messageCounterMaxDayHistory = getInteger(e, "message-counter-max-day-history", messageCounterMaxDayHistory, GT_ZERO);
- serverDumpInterval = getLong(e, "server-dump-interval", serverDumpInterval, GE_ZERO); // in milliseconds
+ serverDumpInterval = getLong(e, "server-dump-interval", serverDumpInterval, MINUS_ONE_OR_GT_ZERO); // in milliseconds
started = true;
}
Modified: trunk/src/main/org/jboss/messaging/core/management/MessagingServerControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/MessagingServerControl.java 2009-08-14 13:08:07 UTC (rev 7725)
+++ trunk/src/main/org/jboss/messaging/core/management/MessagingServerControl.java 2009-08-14 13:58:11 UTC (rev 7726)
@@ -40,8 +40,6 @@
int getConnectionCount();
- long getPagingTotalMemory();
-
boolean isStarted();
String[] getInterceptorClassNames();
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControlImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControlImpl.java 2009-08-14 13:08:07 UTC (rev 7725)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControlImpl.java 2009-08-14 13:58:11 UTC (rev 7726)
@@ -273,11 +273,6 @@
return server.getConnectionCount();
}
- public long getPagingTotalMemory()
- {
- return server.getPagingTotalMemory();
- }
-
public void enableMessageCounters()
{
setMessageCounterEnabled(true);
Modified: trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java 2009-08-14 13:08:07 UTC (rev 7725)
+++ trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java 2009-08-14 13:58:11 UTC (rev 7726)
@@ -81,11 +81,6 @@
return localControl.getConnectionCount();
}
- public long getPagingTotalMemory()
- {
- return localControl.getPagingTotalMemory();
- }
-
public String[] getInterceptorClassNames()
{
return localControl.getInterceptorClassNames();
Modified: trunk/src/main/org/jboss/messaging/core/paging/PagingManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/PagingManager.java 2009-08-14 13:08:07 UTC (rev 7725)
+++ trunk/src/main/org/jboss/messaging/core/paging/PagingManager.java 2009-08-14 13:58:11 UTC (rev 7726)
@@ -134,4 +134,5 @@
*/
void reloadStores() throws Exception;
+ SimpleString[] getStoreNames();
}
Modified: trunk/src/main/org/jboss/messaging/core/paging/PagingStore.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/PagingStore.java 2009-08-14 13:08:07 UTC (rev 7725)
+++ trunk/src/main/org/jboss/messaging/core/paging/PagingStore.java 2009-08-14 13:58:11 UTC (rev 7726)
@@ -22,8 +22,6 @@
package org.jboss.messaging.core.paging;
-import java.util.concurrent.Executor;
-
import org.jboss.messaging.core.server.MessagingComponent;
import org.jboss.messaging.utils.SimpleString;
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java 2009-08-14 13:08:07 UTC (rev 7725)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java 2009-08-14 13:58:11 UTC (rev 7726)
@@ -24,9 +24,9 @@
import java.util.Collection;
import java.util.List;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import org.jboss.messaging.core.logging.Logger;
@@ -100,6 +100,12 @@
// PagingManager implementation
// -----------------------------------------------------------------------------------------------------
+ public SimpleString[] getStoreNames()
+ {
+ Set<SimpleString> names = stores.keySet();
+ return (SimpleString[])names.toArray(new SimpleString[names.size()]);
+ }
+
public void activate()
{
backup = false;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/ChannelImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/ChannelImpl.java 2009-08-14 13:08:07 UTC (rev 7725)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/ChannelImpl.java 2009-08-14 13:58:11 UTC (rev 7726)
@@ -150,6 +150,8 @@
public void returnBlocking()
{
+ System.out.println("ChannelImpl.returnBlocking()");
+ sendSemaphore.release(Integer.MAX_VALUE);
lock.lock();
try
Modified: trunk/src/main/org/jboss/messaging/core/server/MessagingServer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/MessagingServer.java 2009-08-14 13:08:07 UTC (rev 7725)
+++ trunk/src/main/org/jboss/messaging/core/server/MessagingServer.java 2009-08-14 13:58:11 UTC (rev 7726)
@@ -112,8 +112,6 @@
int getConnectionCount();
- long getPagingTotalMemory();
-
PostOffice getPostOffice();
QueueFactory getQueueFactory();
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2009-08-14 13:08:07 UTC (rev 7725)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2009-08-14 13:58:11 UTC (rev 7726)
@@ -637,11 +637,6 @@
return remotingService.getConnections().size();
}
- public long getPagingTotalMemory()
- {
- return pagingManager.getTotalMemory();
- }
-
public PostOffice getPostOffice()
{
return postOffice;
@@ -1035,13 +1030,12 @@
pagingManager.resumeDepages();
- final ServerInfo dumper = new ServerInfo(this);
+ final ServerInfo dumper = new ServerInfo(this, pagingManager);
long dumpInfoInterval = configuration.getServerDumpInterval();
if (dumpInfoInterval > 0)
{
scheduledPool.scheduleWithFixedDelay(new Runnable()
{
-
public void run()
{
log.info(dumper.dump());
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerInfo.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerInfo.java 2009-08-14 13:08:07 UTC (rev 7725)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerInfo.java 2009-08-14 13:58:11 UTC (rev 7726)
@@ -28,7 +28,10 @@
import java.lang.management.ThreadMXBean;
import java.util.Date;
+import org.jboss.messaging.core.paging.PagingManager;
+import org.jboss.messaging.core.paging.PagingStore;
import org.jboss.messaging.core.server.MessagingServer;
+import org.jboss.messaging.utils.SimpleString;
/**
* A ServerInfo
@@ -41,6 +44,8 @@
{
private final MessagingServer server;
+ private PagingManager pagingManager;
+
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
@@ -49,9 +54,10 @@
// Constructors --------------------------------------------------
- public ServerInfo(final MessagingServer server)
+ public ServerInfo(final MessagingServer server, final PagingManager pagingManager)
{
this.server = server;
+ this.pagingManager = pagingManager;
}
// Public --------------------------------------------------------
@@ -70,7 +76,7 @@
info += String.format("non-heap memory: used=%s, max=%s\n",
sizeof(nonHeapMemory.getUsed()),
sizeof(nonHeapMemory.getMax()));
- info += String.format("paging memory: %s\n", sizeof(server.getPagingTotalMemory()));
+ info += appendPagingInfos();
info += String.format("# of thread: %d\n", threadMXBean.getThreadCount());
info += String.format("# of conns: %d\n", server.getConnectionCount());
info += "********************\n";
@@ -83,6 +89,26 @@
// Private -------------------------------------------------------
+ private String appendPagingInfos()
+ {
+ String info = "";
+ info += String.format("total paging memory: %s\n", sizeof(pagingManager.getTotalMemory()));
+ for (SimpleString storeName : pagingManager.getStoreNames())
+ {
+ PagingStore pageStore;
+ try
+ {
+ pageStore = pagingManager.getPageStore(storeName);
+ info += String.format("\t%s: %s\n", storeName, sizeof(pageStore.getPageSizeBytes() * pageStore.getNumberOfPages()));
+ }
+ catch (Exception e)
+ {
+ info += String.format("\t%s: %s\n", storeName, e.getMessage());
+ }
+ }
+ return info;
+ }
+
private static long oneKB = 1024;
private static long oneMB = oneKB * 1024;
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlUsingCoreTest.java 2009-08-14 13:08:07 UTC (rev 7725)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlUsingCoreTest.java 2009-08-14 13:58:11 UTC (rev 7726)
@@ -146,11 +146,6 @@
return (Integer)proxy.retrieveAttributeValue("connectionCount");
}
- public long getPagingTotalMemory()
- {
- return (Integer)proxy.retrieveAttributeValue("pagingTotalMemory");
- }
-
public long getConnectionTTLOverride()
{
return (Long)proxy.retrieveAttributeValue("connectionTTLOverride", Long.class);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueDeployerTest.java 2009-08-14 13:08:07 UTC (rev 7725)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueDeployerTest.java 2009-08-14 13:58:11 UTC (rev 7726)
@@ -219,11 +219,6 @@
return 0;
}
- public long getPagingTotalMemory()
- {
- return 0;
- }
-
public long getConnectionTTLOverride()
{
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java 2009-08-14 13:08:07 UTC (rev 7725)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java 2009-08-14 13:58:11 UTC (rev 7726)
@@ -751,6 +751,11 @@
{
return 0;
}
+
+ public SimpleString[] getStoreNames()
+ {
+ return null;
+ }
public long getMaxMemory()
{
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java 2009-08-14 13:08:07 UTC (rev 7725)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java 2009-08-14 13:58:11 UTC (rev 7726)
@@ -205,6 +205,11 @@
{
return 0;
}
+
+ public SimpleString[] getStoreNames()
+ {
+ return null;
+ }
public long getMaxMemory()
{
More information about the jboss-cvs-commits
mailing list