[infinispan-commits] Infinispan SVN: r454 - in trunk: core/src/main/java/org/infinispan/interceptors/base and 6 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Fri Jun 12 09:46:28 EDT 2009
Author: manik.surtani at jboss.com
Date: 2009-06-12 09:46:28 -0400 (Fri, 12 Jun 2009)
New Revision: 454
Modified:
trunk/core/src/main/java/org/infinispan/interceptors/ActivationInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/CacheLoaderInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/CacheMgmtInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/PassivationInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/base/JmxStatsCommandInterceptor.java
trunk/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
trunk/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java
trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java
trunk/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java
trunk/core/src/test/java/org/infinispan/jmx/CacheLoaderAndCacheStoreInterceptorMBeanTest.java
trunk/core/src/test/java/org/infinispan/jmx/CacheMgmtInterceptorMBeanTest.java
trunk/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java
trunk/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java
trunk/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java
trunk/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java
trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/CacheComponent.java
trunk/jopr-plugin/src/main/resources/META-INF/rhq-plugin.xml
Log:
Clearer JMX information
Modified: trunk/core/src/main/java/org/infinispan/interceptors/ActivationInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/ActivationInterceptor.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/main/java/org/infinispan/interceptors/ActivationInterceptor.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -8,6 +8,7 @@
import org.infinispan.config.ConfigurationException;
import org.infinispan.context.InvocationContext;
import org.infinispan.factories.annotations.Start;
+import org.infinispan.jmx.annotations.MBean;
import org.infinispan.jmx.annotations.ManagedAttribute;
import org.infinispan.jmx.annotations.ManagedOperation;
import org.infinispan.loaders.CacheLoaderException;
@@ -15,6 +16,7 @@
import java.util.concurrent.atomic.AtomicLong;
+ at MBean(objectName = "Activation", description = "Component that handles activating entries that have been passivated to a CacheStore by loading them into memory.")
public class ActivationInterceptor extends CacheLoaderInterceptor {
private AtomicLong activations = new AtomicLong(0);
@@ -79,13 +81,13 @@
notifier.notifyCacheEntryActivated(key, pre, ctx);
}
- @ManagedAttribute(description = "number of activation events")
+ @ManagedAttribute(description = "Number of activation events")
public String getActivations() {
if (!getStatisticsEnabled()) return "N/A";
return String.valueOf(activations.get());
}
- @ManagedOperation
+ @ManagedOperation(description = "Resets statistics gathered by this component")
public void resetStatistics() {
super.resetStatistics();
activations.set(0);
Modified: trunk/core/src/main/java/org/infinispan/interceptors/CacheLoaderInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/CacheLoaderInterceptor.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/main/java/org/infinispan/interceptors/CacheLoaderInterceptor.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -35,6 +35,7 @@
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.Start;
import org.infinispan.interceptors.base.JmxStatsCommandInterceptor;
+import org.infinispan.jmx.annotations.MBean;
import org.infinispan.jmx.annotations.ManagedAttribute;
import org.infinispan.jmx.annotations.ManagedOperation;
import org.infinispan.loaders.CacheLoader;
@@ -43,6 +44,7 @@
import java.util.concurrent.atomic.AtomicLong;
+ at MBean(objectName = "CacheLoader", description = "Component that handles loading entries from a CacheStore into memory.")
public class CacheLoaderInterceptor extends JmxStatsCommandInterceptor {
private final AtomicLong cacheLoads = new AtomicLong(0);
private final AtomicLong cacheMisses = new AtomicLong(0);
@@ -177,17 +179,17 @@
}
}
- @ManagedAttribute(description = "number of cache loader loads")
+ @ManagedAttribute(description = "Number of CacheLoader loads")
public long getCacheLoaderLoads() {
return cacheLoads.get();
}
- @ManagedAttribute(description = "number of cache loader misses")
+ @ManagedAttribute(description = "Number of CacheLoader misses")
public long getCacheLoaderMisses() {
return cacheMisses.get();
}
- @ManagedOperation
+ @ManagedOperation(description = "Resets statistics gathered by this component")
public void resetStatistics() {
cacheLoads.set(0);
cacheMisses.set(0);
Modified: trunk/core/src/main/java/org/infinispan/interceptors/CacheMgmtInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/CacheMgmtInterceptor.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/main/java/org/infinispan/interceptors/CacheMgmtInterceptor.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -29,6 +29,7 @@
import org.infinispan.context.InvocationContext;
import org.infinispan.factories.annotations.Inject;
import org.infinispan.interceptors.base.JmxStatsCommandInterceptor;
+import org.infinispan.jmx.annotations.MBean;
import org.infinispan.jmx.annotations.ManagedAttribute;
import org.infinispan.jmx.annotations.ManagedOperation;
@@ -41,6 +42,7 @@
* @author Jerry Gauthier
* @since 4.0
*/
+ at MBean(objectName = "Statistics", description = "General statistics such as timings, hit/miss ratio, etc.")
public class CacheMgmtInterceptor extends JmxStatsCommandInterceptor {
private AtomicLong hitTimes = new AtomicLong(0);
private AtomicLong missTimes = new AtomicLong(0);
@@ -170,7 +172,7 @@
return (System.currentTimeMillis() - reset.get()) / 1000;
}
- @ManagedOperation
+ @ManagedOperation(description = "Resets statistics gathered by this component")
public void resetStatistics() {
hits.set(0);
misses.set(0);
Modified: trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -42,6 +42,7 @@
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.Start;
import org.infinispan.interceptors.base.JmxStatsCommandInterceptor;
+import org.infinispan.jmx.annotations.MBean;
import org.infinispan.jmx.annotations.ManagedAttribute;
import org.infinispan.jmx.annotations.ManagedOperation;
import org.infinispan.loaders.CacheLoaderManager;
@@ -69,6 +70,7 @@
* @author Bela Ban
* @since 4.0
*/
+ at MBean(objectName = "CacheStore", description = "Component that handles storing of entries to a CacheStore from memory.")
public class CacheStoreInterceptor extends JmxStatsCommandInterceptor {
private CacheLoaderManagerConfig loaderConfig = null;
private HashMap<GlobalTransaction, Integer> txStores = new HashMap<GlobalTransaction, Integer>();
@@ -76,7 +78,6 @@
private final AtomicLong cacheStores = new AtomicLong(0);
CacheStore store;
private CacheLoaderManager loaderManager;
- private boolean statsEnabled;
public CacheStoreInterceptor() {
log = LogFactory.getLog(getClass());
@@ -303,21 +304,11 @@
}
}
- @ManagedOperation
+ @ManagedOperation(description = "Resets statistics gathered by this component")
public void resetStatistics() {
cacheStores.set(0);
}
- @ManagedAttribute
- public boolean getStatisticsEnabled() {
- return statsEnabled;
- }
-
- @ManagedAttribute
- public void setStatisticsEnabled(boolean enabled) {
- this.statsEnabled = enabled;
- }
-
@ManagedAttribute(description = "number of cache loader stores")
public long getCacheLoaderStores() {
return cacheStores.get();
Modified: trunk/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -68,6 +68,7 @@
private final AtomicLong invalidations = new AtomicLong(0);
protected Map<GlobalTransaction, List<VisitableCommand>> txMods;
private CommandsFactory commandsFactory;
+ @ManagedAttribute(name = "StatisticsEnabled", description = "Enables or disables the gathering of statistics by this component", writable = true)
private boolean statsEnabled;
@Inject
@@ -211,17 +212,15 @@
if (statsEnabled) invalidations.incrementAndGet();
}
- @ManagedOperation
+ @ManagedOperation(description = "Resets statistics gathered by this component")
public void resetStatistics() {
invalidations.set(0);
}
- @ManagedAttribute
public boolean getStatisticsEnabled() {
return this.statsEnabled;
}
- @ManagedAttribute
public void setStatisticsEnabled(boolean enabled) {
this.statsEnabled = enabled;
}
Modified: trunk/core/src/main/java/org/infinispan/interceptors/PassivationInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/PassivationInterceptor.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/main/java/org/infinispan/interceptors/PassivationInterceptor.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -8,6 +8,7 @@
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.Start;
import org.infinispan.interceptors.base.JmxStatsCommandInterceptor;
+import org.infinispan.jmx.annotations.MBean;
import org.infinispan.jmx.annotations.ManagedAttribute;
import org.infinispan.jmx.annotations.ManagedOperation;
import org.infinispan.loaders.CacheLoaderManager;
@@ -21,6 +22,7 @@
*
* @since 4.0
*/
+ at MBean(objectName = "Passivation", description = "Component that handles passivating entries to a CacheStore on eviction.")
public class PassivationInterceptor extends JmxStatsCommandInterceptor {
private final AtomicLong passivations = new AtomicLong(0);
@@ -56,7 +58,7 @@
return invokeNextInterceptor(ctx, command);
}
- @ManagedOperation
+ @ManagedOperation(description = "Resets statistics gathered by this component")
public void resetStatistics() {
passivations.set(0);
}
Modified: trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -20,6 +20,7 @@
import org.infinispan.context.impl.TxInvocationContext;
import org.infinispan.factories.annotations.Inject;
import org.infinispan.interceptors.base.CommandInterceptor;
+import org.infinispan.jmx.annotations.MBean;
import org.infinispan.jmx.annotations.ManagedAttribute;
import org.infinispan.jmx.annotations.ManagedOperation;
import org.infinispan.transaction.TransactionLog;
@@ -42,6 +43,7 @@
* @see org.infinispan.transaction.xa.TransactionXaAdapter
* @since 4.0
*/
+ at MBean(objectName = "Transactions", description = "Component that manages the cache's participation in JTA transactions.")
public class TxInterceptor extends CommandInterceptor {
private TransactionManager tm;
@@ -51,6 +53,7 @@
private final AtomicLong prepares = new AtomicLong(0);
private final AtomicLong commits = new AtomicLong(0);
private final AtomicLong rollbacks = new AtomicLong(0);
+ @ManagedAttribute(name = "StatisticsEnabled", description = "Enables or disables the gathering of statistics by this component", writable = true)
private boolean statsEnabled;
@@ -209,19 +212,17 @@
return false;
}
- @ManagedOperation
+ @ManagedOperation(description = "Resets statistics gathered by this component")
public void resetStatistics() {
prepares.set(0);
commits.set(0);
rollbacks.set(0);
}
- @ManagedAttribute
public boolean getStatisticsEnabled() {
return this.statsEnabled;
}
- @ManagedAttribute
public void setStatisticsEnabled(boolean enabled) {
this.statsEnabled = enabled;
}
Modified: trunk/core/src/main/java/org/infinispan/interceptors/base/JmxStatsCommandInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/base/JmxStatsCommandInterceptor.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/main/java/org/infinispan/interceptors/base/JmxStatsCommandInterceptor.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -33,6 +33,7 @@
* @since 4.0
*/
public abstract class JmxStatsCommandInterceptor extends CommandInterceptor implements JmxStatisticsExposer {
+ @ManagedAttribute(name = "StatisticsEnabled", description = "Enables or disables the gathering of statistics by this component", writable = true)
private boolean statsEnabled = false;
@Start
@@ -45,7 +46,6 @@
*
* @return true if statistics are captured
*/
- @ManagedAttribute
public boolean getStatisticsEnabled() {
return statsEnabled;
}
@@ -53,7 +53,6 @@
/**
* @param enabled whether gathering statistics for JMX are enabled.
*/
- @ManagedAttribute
public void setStatisticsEnabled(boolean enabled) {
statsEnabled = enabled;
}
@@ -61,7 +60,7 @@
/**
* Resets statistics gathered. Is a no-op, and should be overridden if it is to be meaningful.
*/
- @ManagedOperation
+ @ManagedOperation(description = "Resets statistics gathered by this component")
public void resetStatistics() {
}
}
Modified: trunk/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -89,7 +89,7 @@
*/
@Scope(Scopes.GLOBAL)
@NonVolatile
- at MBean(objectName = "CacheManager")
+ at MBean(objectName = "CacheManager", description = "Component that acts as a manager, factory and container for caches in the system.")
public class DefaultCacheManager implements CacheManager {
public static final String DEFAULT_CACHE_NAME = "org.infinispan.manager.DefaultCacheManager.DEFAULT_CACHE_NAME";
protected GlobalConfiguration globalConfiguration;
Modified: trunk/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -38,7 +38,7 @@
* @author Manik Surtani
* @since 4.0
*/
- at MBean(objectName = "RpcManager")
+ at MBean(objectName = "RpcManager", description = "Magaes all remote calls to remote cache instances in the cluster.")
public class RpcManagerImpl implements RpcManager {
private static final Log log = LogFactory.getLog(RpcManagerImpl.class);
@@ -47,6 +47,7 @@
private Transport t;
private final AtomicLong replicationCount = new AtomicLong(0);
private final AtomicLong replicationFailures = new AtomicLong(0);
+ @ManagedAttribute(name = "StatisticsEnabled", description = "Enables or disables the gathering of statistics by this component", writable = true)
boolean statisticsEnabled = false; // by default, don't gather statistics.
private volatile Address currentStateTransferSource;
private boolean stateTransferEnabled;
@@ -271,7 +272,7 @@
// -------------------------------------------- JMX information -----------------------------------------------
- @ManagedOperation
+ @ManagedOperation(description = "Resets statistics gathered by this component")
public void resetStatistics() {
replicationCount.set(0);
replicationFailures.set(0);
@@ -293,12 +294,10 @@
return String.valueOf(replicationFailures.get());
}
- @ManagedAttribute(description = "whether or not jmx statistics are enabled")
public boolean isStatisticsEnabled() {
return statisticsEnabled;
}
- @ManagedAttribute
public void setStatisticsEnabled(boolean statisticsEnabled) {
this.statisticsEnabled = statisticsEnabled;
}
@@ -310,14 +309,14 @@
return address == null ? "N/A" : address.toString();
}
- @ManagedAttribute
+ @ManagedAttribute(description = "List of members in the cluster")
public String getMembers() {
if (t == null || !isStatisticsEnabled()) return "N/A";
List<Address> addressList = t.getMembers();
return addressList.toString();
}
- @ManagedAttribute
+ @ManagedAttribute(description = "Successful replications as a ratio of total replications")
public String getSuccessRatio() {
if (replicationCount.get() == 0 || !statisticsEnabled) {
return "N/A";
Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -51,7 +51,7 @@
* @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
* @since 4.0
*/
- at MBean(objectName = "MvccLockManager", description = "Manager that handles MVCC locks for entries")
+ at MBean(objectName = "LockManager", description = "Manager that handles MVCC locks for entries")
public class LockManagerImpl implements LockManager {
protected Configuration configuration;
LockContainer lockContainer;
Modified: trunk/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -49,8 +49,8 @@
cacheManager.defineCache("test", configuration);
cache = cacheManager.getCache("test");
- activationInterceptorObjName = new ObjectName("ActivationAndPassivationInterceptorMBeanTest:cache-name=test(local),jmx-resource=ActivationInterceptor");
- passivationInterceptorObjName = new ObjectName("ActivationAndPassivationInterceptorMBeanTest:cache-name=test(local),jmx-resource=PassivationInterceptor");
+ activationInterceptorObjName = new ObjectName("ActivationAndPassivationInterceptorMBeanTest:cache-name=test(local),jmx-resource=Activation");
+ passivationInterceptorObjName = new ObjectName("ActivationAndPassivationInterceptorMBeanTest:cache-name=test(local),jmx-resource=Passivation");
threadMBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
cacheStore = TestingUtil.extractComponent(cache, CacheLoaderManager.class).getCacheStore();
Modified: trunk/core/src/test/java/org/infinispan/jmx/CacheLoaderAndCacheStoreInterceptorMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/CacheLoaderAndCacheStoreInterceptorMBeanTest.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/test/java/org/infinispan/jmx/CacheLoaderAndCacheStoreInterceptorMBeanTest.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -47,8 +47,8 @@
cacheManager.defineCache("test", configuration);
cache = cacheManager.getCache("test");
- loaderInterceptorObjName = new ObjectName("CacheLoaderAndCacheStoreInterceptorMBeanTest:cache-name=test(local),jmx-resource=CacheLoaderInterceptor");
- storeInterceptorObjName = new ObjectName("CacheLoaderAndCacheStoreInterceptorMBeanTest:cache-name=test(local),jmx-resource=CacheStoreInterceptor");
+ loaderInterceptorObjName = new ObjectName("CacheLoaderAndCacheStoreInterceptorMBeanTest:cache-name=test(local),jmx-resource=CacheLoader");
+ storeInterceptorObjName = new ObjectName("CacheLoaderAndCacheStoreInterceptorMBeanTest:cache-name=test(local),jmx-resource=CacheStore");
threadMBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
cacheStore = TestingUtil.extractComponent(cache, CacheLoaderManager.class).getCacheStore();
Modified: trunk/core/src/test/java/org/infinispan/jmx/CacheMgmtInterceptorMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/CacheMgmtInterceptorMBeanTest.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/test/java/org/infinispan/jmx/CacheMgmtInterceptorMBeanTest.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -34,7 +34,7 @@
configuration.setExposeJmxStatistics(true);
cacheManager.defineCache("test", configuration);
cache = cacheManager.getCache("test");
- mgmtInterceptor = new ObjectName("CacheMgmtInterceptorMBeanTest:cache-name=test(local),jmx-resource=CacheMgmtInterceptor");
+ mgmtInterceptor = new ObjectName("CacheMgmtInterceptorMBeanTest:cache-name=test(local),jmx-resource=Statistics");
threadMBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
return cacheManager;
Modified: trunk/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -5,7 +5,6 @@
import org.infinispan.config.Configuration;
import org.infinispan.config.GlobalConfiguration;
import org.infinispan.factories.AbstractComponentRegistry;
-import org.infinispan.interceptors.CacheMgmtInterceptor;
import org.infinispan.manager.CacheManager;
import org.infinispan.test.TestingUtil;
import org.infinispan.test.fwk.TestCacheManagerFactory;
@@ -59,7 +58,7 @@
ComponentsJmxRegistration regComponents = buildRegistrator(first);
regComponents.registerMBeans();
- String name = regComponents.getObjectName(CacheMgmtInterceptor.class.getSimpleName());
+ String name = regComponents.getObjectName("Statistics");
ObjectName name1 = new ObjectName(name);
assert mBeanServer.isRegistered(name1);
regComponents.unregisterMBeans();
@@ -86,7 +85,7 @@
ComponentsJmxRegistration regComponents = buildRegistrator(first);
regComponents.registerMBeans();
- String name = regComponents.getObjectName(CacheMgmtInterceptor.class.getSimpleName());
+ String name = regComponents.getObjectName("Statistics");
ObjectName name1 = new ObjectName(name);
assertCorrectJmxName(name1, first);
assert mBeanServer.isRegistered(name1);
@@ -114,8 +113,8 @@
replicatedRegComponents.registerMBeans();
localRegComponents.registerMBeans();
- String replicatedtCMgmtIntName = replicatedRegComponents.getObjectName(CacheMgmtInterceptor.class.getSimpleName());
- String localCMgmtIntName = localRegComponents.getObjectName(CacheMgmtInterceptor.class.getSimpleName());
+ String replicatedtCMgmtIntName = replicatedRegComponents.getObjectName("Statistics");
+ String localCMgmtIntName = localRegComponents.getObjectName("Statistics");
ObjectName replObjectName = new ObjectName(replicatedtCMgmtIntName);
ObjectName localObjName = new ObjectName(localCMgmtIntName);
assertCorrectJmxName(replObjectName, replicatedCache);
Modified: trunk/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -57,19 +57,19 @@
cm.getCache("remote1");
cm.getCache("remote2");
- assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=Statistics");
assert existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=RpcManager");
- assert existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=Statistics");
assert existsObject("infinispan:cache-name=remote2(invalidation_async),jmx-resource=RpcManager");
- assert existsObject("infinispan:cache-name=remote2(invalidation_async),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("infinispan:cache-name=remote2(invalidation_async),jmx-resource=Statistics");
TestingUtil.killCacheManagers(cm);
- assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+ assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=Statistics");
assert !existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=RpcManager");
- assert !existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=CacheMgmtInterceptor");
+ assert !existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=Statistics");
assert !existsObject("infinispan:cache-name=remote2(invalidation_async),jmx-resource=RpcManager");
- assert !existsObject("infinispan:cache-name=remote2(invalidation_async),jmx-resource=CacheMgmtInterceptor");
+ assert !existsObject("infinispan:cache-name=remote2(invalidation_async),jmx-resource=Statistics");
}
public void testDifferentDomain() {
@@ -84,7 +84,7 @@
cm.defineCache("local_cache", localCache);
cm.getCache("local_cache");
- assert existsObject("mircea_jmx_domain:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("mircea_jmx_domain:cache-name=local_cache(local),jmx-resource=Statistics");
}
@@ -106,9 +106,9 @@
cm.getCache("local_cache");
cm.getCache("remote1");
- assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+ assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=Statistics");
assert existsObject("infinispan:cache-name=[global],jmx-resource=CacheManager");
- assert !existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=CacheMgmtInterceptor");
+ assert !existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=Statistics");
}
public void testOnlyPerCacheJmxStatsEnabled() {
@@ -129,9 +129,9 @@
cm.getCache("local_cache");
cm.getCache("remote1");
- assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=Statistics");
assert !existsObject("infinispan:cache-name=[global],jmx-resource=RpcManager");
- assert existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=Statistics");
}
public void testMultipleManagersOnSameServerFails() {
@@ -143,7 +143,7 @@
localCache.setExposeJmxStatistics(true);
cm.defineCache("local_cache", localCache);
cm.getCache("local_cache");
- assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=Statistics");
GlobalConfiguration globalConfiguration2 = GlobalConfiguration.getClusteredDefault();
globalConfiguration2.setExposeGlobalJmxStatistics(true);
@@ -172,7 +172,7 @@
localCache.setExposeJmxStatistics(true);
cm.defineCache("local_cache", localCache);
cm.getCache("local_cache");
- assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=Statistics");
GlobalConfiguration globalConfiguration2 = GlobalConfiguration.getClusteredDefault();
globalConfiguration2.setExposeGlobalJmxStatistics(true);
@@ -183,7 +183,7 @@
localCache2.setExposeJmxStatistics(true);
cm2.defineCache("local_cache", localCache);
cm2.getCache("local_cache");
- assert existsObject("infinispan2:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("infinispan2:cache-name=local_cache(local),jmx-resource=Statistics");
GlobalConfiguration globalConfiguration3 = GlobalConfiguration.getClusteredDefault();
globalConfiguration3.setExposeGlobalJmxStatistics(true);
@@ -194,7 +194,7 @@
localCache3.setExposeJmxStatistics(true);
cm3.defineCache("local_cache", localCache);
cm3.getCache("local_cache");
- assert existsObject("infinispan3:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("infinispan3:cache-name=local_cache(local),jmx-resource=Statistics");
}
public void testUnregisterJmxInfoOnStop() {
@@ -207,11 +207,11 @@
localCache.setExposeJmxStatistics(true);
cm.defineCache("local_cache", localCache);
cm.getCache("local_cache");
- assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=Statistics");
TestingUtil.killCacheManagers(cm);
- assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+ assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=Statistics");
assert !existsDomains("infinispan");
}
@@ -223,7 +223,7 @@
Configuration localCache = config();//local by default
cm.defineCache("local_cache", localCache);
cm.getCache("local_cache");
- assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=Statistics");
//now register a global one
GlobalConfiguration globalConfiguration2 = GlobalConfiguration.getClusteredDefault();
@@ -236,15 +236,15 @@
remoteCache.setCacheMode(Configuration.CacheMode.REPL_SYNC);
cm2.defineCache("remote_cache", remoteCache);
cm2.getCache("remote_cache");
- assert existsObject("infinispan2:cache-name=remote_cache(repl_sync),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("infinispan2:cache-name=remote_cache(repl_sync),jmx-resource=Statistics");
cm2.stop();
- assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
- assert !existsObject("infinispan2:cache-name=remote_cache(repl_sync),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=Statistics");
+ assert !existsObject("infinispan2:cache-name=remote_cache(repl_sync),jmx-resource=Statistics");
cm.stop();
- assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
- assert !existsObject("infinispan2:cache-name=remote_cache(repl_sync),jmx-resource=CacheMgmtInterceptor");
+ assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=Statistics");
+ assert !existsObject("infinispan2:cache-name=remote_cache(repl_sync),jmx-resource=Statistics");
}
static boolean existsObject(String s) {
Modified: trunk/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -39,7 +39,7 @@
cacheManager.defineCache("test", configuration);
cache = cacheManager.getCache("test");
- lockManagerObjName = new ObjectName("MvccLockManagerMBeanTest:cache-name=test(local),jmx-resource=MvccLockManager");
+ lockManagerObjName = new ObjectName("MvccLockManagerMBeanTest:cache-name=test(local),jmx-resource=LockManager");
threadMBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
return cacheManager;
Modified: trunk/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -42,7 +42,7 @@
cacheManager2.defineCache("test", configuration.clone());
cache1 = cacheManager1.getCache("test");
cache2 = cacheManager2.getCache("test");
- txInterceptor = new ObjectName("TxInterceptorMBeanTest:cache-name=test(repl_sync),jmx-resource=TxInterceptor");
+ txInterceptor = new ObjectName("TxInterceptorMBeanTest:cache-name=test(repl_sync),jmx-resource=Transactions");
threadMBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
tm = TestingUtil.getTransactionManager(cache1);
Modified: trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/CacheComponent.java
===================================================================
--- trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/CacheComponent.java 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/CacheComponent.java 2009-06-12 13:46:28 UTC (rev 454)
@@ -56,9 +56,9 @@
private static final Map<String, String> abbrevToMBean = new HashMap<String, String>();
static {
- abbrevToMBean.put("Mgmt", "CacheMgmtInterceptor");
- abbrevToMBean.put("Mvcc", "MvccLockManager");
- abbrevToMBean.put("Tx", "TxInterceptor");
+ abbrevToMBean.put("Statistics", "Statistics");
+ abbrevToMBean.put("LockManager", "LockManager");
+ abbrevToMBean.put("Transactions", "Transactions");
}
Modified: trunk/jopr-plugin/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- trunk/jopr-plugin/src/main/resources/META-INF/rhq-plugin.xml 2009-06-12 11:38:31 UTC (rev 453)
+++ trunk/jopr-plugin/src/main/resources/META-INF/rhq-plugin.xml 2009-06-12 13:46:28 UTC (rev 454)
@@ -38,48 +38,48 @@
description="One individual cache in Infinispan"
>
- <operation name="Mgmt.resetStatistics" displayName="Reset Statistics (Mgmt)"
+ <operation name="Statistics.resetStatistics" displayName="Reset Statistics (Statistics)"
description="Reset statistics on the CacheManagement Interceptor"/>
- <operation name="Tx.resetStatistics" displayName="Reset Statistics (Tx)"
+ <operation name="Transactions.resetStatistics" displayName="Reset Statistics (Transactions)"
description="Reset statistics on the Transaction Interceptor"/>
- <metric property="Mgmt.averageReadTime" displayName="Average Read Time"
+ <metric property="Statistics.averageReadTime" displayName="Average Read Time"
description="Average time to read an entry from the cache"
units="milliseconds" measurementType="dynamic"/>
- <metric property="Mgmt.averageWriteTime" displayName="Average Write Time"
+ <metric property="Statistics.averageWriteTime" displayName="Average Write Time"
description="Average time to write an entry to the cache"
units="milliseconds" measurementType="dynamic"/>
- <metric property="Mgmt.evictions" displayName="Evictions" measurementType="trendsup"
+ <metric property="Statistics.evictions" displayName="Evictions" measurementType="trendsup"
description="How many items got evicted from the cache" displayType="summary"/>
- <metric property="Mgmt.hitRatio" displayName="Hit Ratio"
+ <metric property="Statistics.hitRatio" displayName="Hit Ratio"
description="Hit ratio of this cache" displayType="summary"
units="percentage"/>
- <metric property="Mgmt.hits" displayName="Hits" description="Number of cache hits"
+ <metric property="Statistics.hits" displayName="Hits" description="Number of cache hits"
measurementType="trendsup"/>
- <metric property="Mgmt.misses" displayName="Misses" description="Number of cache misses"
+ <metric property="Statistics.misses" displayName="Misses" description="Number of cache misses"
measurementType="trendsup"/>
- <metric property="Mgmt.numberOfEntries" displayName="Number of Entries"
+ <metric property="Statistics.numberOfEntries" displayName="Number of Entries"
description="The number of entries in this cache"/>
- <metric property="Mgmt.readWriteRatio" displayName="Read write ratio"
+ <metric property="Statistics.readWriteRatio" displayName="Read write ratio"
description="The ratio between reads and writes of this cache"
units="percentage"/>
- <metric property="Mgmt.stores" displayName="Stores" description="Number of stores in the cache"
+ <metric property="Statistics.stores" displayName="Stores" description="Number of stores in the cache"
measurementType="trendsup"/>
- <metric property="Mvcc.numerOfLocksAvailable" displayName="Number of Locks availabe"
+ <metric property="LockManager.numerOfLocksAvailable" displayName="Number of Locks availabe"
description="How many locks are still available in this Cache"
units="none" measurementType="dynamic"/>
- <metric property="Mvcc.concurrencyLevel" displayName="Concurrency Level"/>
+ <metric property="LockManager.concurrencyLevel" displayName="Concurrency Level"/>
<!-- TODO description -->
- <metric property="Mvcc.numberOfLocksHeld" displayName="Number of Locks held"/>
+ <metric property="LockManager.numberOfLocksHeld" displayName="Number of Locks held"/>
- <metric property="Tx.commits" displayName="Commits"
+ <metric property="Transactions.commits" displayName="Commits"
description="Number of transaction commits performed since last reset"
units="none" measurementType="trendsup" displayType="summary"/>
- <metric property="Tx.prepares" displayName="Prepares"
+ <metric property="Transactions.prepares" displayName="Prepares"
description="Number of transaction prepares performed since last reset"
units="none" measurementType="trendsup"/>
- <metric property="Tx.rollbacks" displayName="Rollbacks"
+ <metric property="Transactions.rollbacks" displayName="Rollbacks"
description="Number of transaction rollbacks performed since last reset"
units="none" measurementType="trendsup" displayType="summary"/>
</service>
More information about the infinispan-commits
mailing list