From b6bd1b239d10c8f87ac5233d8cf472cf4a366af5 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Thu, 30 Apr 2015 20:26:16 -0400 Subject: [PATCH] Remove "Unavailable" properties from ShardStats There's several property getters in ShardStats that don't apply anymore and return null. They display as "Unavailable" in JConsole but cause an NPE when queried via jolokia. We should remove them. Change-Id: I6da8f331e007246c655a982b9cd335de553195aa Signed-off-by: Tom Pantelis (cherry picked from commit 63c43e481fe503a3b90c7e6c55ac21514be0f6db) --- .../jmx/mbeans/shard/ShardStats.java | 23 ------------------- .../jmx/mbeans/shard/ShardStatsMXBean.java | 10 -------- 2 files changed, 33 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStats.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStats.java index e3c8ced878..2e8d093139 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStats.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStats.java @@ -25,10 +25,8 @@ import org.opendaylight.controller.cluster.raft.client.messages.GetOnDemandRaftS import org.opendaylight.controller.cluster.raft.client.messages.OnDemandRaftState; import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean; import org.opendaylight.controller.md.sal.common.util.jmx.QueuedNotificationManagerMXBeanImpl; -import org.opendaylight.controller.md.sal.common.util.jmx.ThreadExecutorStats; import org.opendaylight.controller.md.sal.common.util.jmx.ThreadExecutorStatsMXBeanImpl; import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; -import org.opendaylight.yangtools.util.concurrent.ListenerNotificationQueueStats; import org.opendaylight.yangtools.util.concurrent.QueuedNotificationManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -282,27 +280,6 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean { return getOnDemandRaftState().getInMemoryJournalLogSize(); } - @Override - public ThreadExecutorStats getDataStoreExecutorStats() { - // FIXME: this particular thing does not work, as it really is DS-specific - return null; - } - - @Override - public ThreadExecutorStats getNotificationMgrExecutorStats() { - return notificationExecutorStatsBean.toThreadExecutorStats(); - } - - @Override - public List getCurrentNotificationMgrListenerQueueStats() { - return notificationManagerStatsBean.getCurrentListenerQueueStats(); - } - - @Override - public int getMaxNotificationMgrListenerQueueSize() { - return notificationManagerStatsBean.getMaxListenerQueueSize(); - } - /** * resets the counters related to transactions */ diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStatsMXBean.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStatsMXBean.java index 12cea50e44..8115f79f3d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStatsMXBean.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStatsMXBean.java @@ -2,8 +2,6 @@ package org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard; import java.util.List; import org.opendaylight.controller.cluster.raft.client.messages.FollowerInfo; -import org.opendaylight.controller.md.sal.common.util.jmx.ThreadExecutorStats; -import org.opendaylight.yangtools.util.concurrent.ListenerNotificationQueueStats; /** * @author: syedbahm @@ -60,14 +58,6 @@ public interface ShardStatsMXBean { boolean isSnapshotCaptureInitiated(); - ThreadExecutorStats getDataStoreExecutorStats(); - - ThreadExecutorStats getNotificationMgrExecutorStats(); - - List getCurrentNotificationMgrListenerQueueStats(); - - int getMaxNotificationMgrListenerQueueSize(); - void resetTransactionCounters(); long getInMemoryJournalDataSize(); -- 2.36.6