X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fjmx%2Fmbeans%2Fshard%2FShardStats.java;h=b01eb099a5707975515c00d7c661725ff8f16400;hp=e3c8ced878232f2a831d541f6bbb3b14b233327d;hb=a8000ee3b6071fa3b83500a39fc60ab3a9c5f085;hpb=66933d6f5760a93cf4e26c33e33dbb17c041e289

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..b01eb099a5 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
@@ -11,6 +11,7 @@ package org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard;
 import akka.actor.ActorRef;
 import akka.pattern.Patterns;
 import akka.util.Timeout;
+import com.google.common.base.Joiner;
 import com.google.common.base.Stopwatch;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -20,18 +21,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
+import org.opendaylight.controller.cluster.datastore.Shard;
+import org.opendaylight.controller.cluster.raft.base.messages.InitiateCaptureSnapshot;
 import org.opendaylight.controller.cluster.raft.client.messages.FollowerInfo;
 import org.opendaylight.controller.cluster.raft.client.messages.GetOnDemandRaftState;
 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;
 import scala.concurrent.Await;
 
 /**
@@ -42,8 +37,6 @@ import scala.concurrent.Await;
 public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
     public static String JMX_CATEGORY_SHARD = "Shards";
 
-    private static final Logger LOG = LoggerFactory.getLogger(ShardStats.class);
-
     private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
 
     private static final Cache<String, OnDemandRaftState> onDemandRaftStateCache =
@@ -65,13 +58,9 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
 
     private long abortTransactionsCount;
 
-    private ThreadExecutorStatsMXBeanImpl notificationExecutorStatsBean;
-
-    private QueuedNotificationManagerMXBeanImpl notificationManagerStatsBean;
-
     private boolean followerInitialSyncStatus = false;
 
-    private ActorRef shardActor;
+    private Shard shard;
 
     private String statRetrievalError;
 
@@ -85,15 +74,8 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
         super(shardName, mxBeanType, JMX_CATEGORY_SHARD);
     }
 
-    public void setNotificationManager(final QueuedNotificationManager<?, ?> manager) {
-        this.notificationManagerStatsBean = new QueuedNotificationManagerMXBeanImpl(manager,
-                "notification-manager", getMBeanType(), getMBeanCategory());
-
-        this.notificationExecutorStatsBean = ThreadExecutorStatsMXBeanImpl.create(manager.getExecutor());
-    }
-
-    public void setShardActor(ActorRef shardActor) {
-        this.shardActor = shardActor;
+    public void setShard(Shard shard) {
+        this.shard = shard;
     }
 
     private OnDemandRaftState getOnDemandRaftState() {
@@ -103,12 +85,12 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
             statRetrievalError = null;
             statRetrievalTime = null;
 
-            if(shardActor != null) {
+            if(shard != null) {
                 Timeout timeout = new Timeout(10, TimeUnit.SECONDS);
                 try {
                     Stopwatch timer = Stopwatch.createStarted();
 
-                    state = (OnDemandRaftState) Await.result(Patterns.ask(shardActor,
+                    state = (OnDemandRaftState) Await.result(Patterns.ask(shard.getSelf(),
                             GetOnDemandRaftState.INSTANCE, timeout), timeout.duration());
 
                     statRetrievalTime = timer.stop().toString();
@@ -213,6 +195,15 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
     public String getVotedFor() {
         return getOnDemandRaftState().getVotedFor();
     }
+    @Override
+    public boolean isVoting() {
+        return getOnDemandRaftState().isVoting();
+    }
+
+    @Override
+    public String getPeerVotingStates() {
+        return toStringMap(getOnDemandRaftState().getPeerVotingStates());
+    }
 
     @Override
     public boolean isSnapshotCaptureInitiated() {
@@ -282,27 +273,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<ListenerNotificationQueueStats> getCurrentNotificationMgrListenerQueueStats() {
-        return notificationManagerStatsBean.getCurrentListenerQueueStats();
-    }
-
-    @Override
-    public int getMaxNotificationMgrListenerQueueSize() {
-        return notificationManagerStatsBean.getMaxListenerQueueSize();
-    }
-
     /**
      * resets the counters related to transactions
      */
@@ -326,10 +296,6 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
 
     }
 
-    public void setDataStore(final InMemoryDOMDataStore store) {
-        setNotificationManager(store.getDataChangeListenerNotificationManager());
-    }
-
     public void setFollowerInitialSyncStatus(boolean followerInitialSyncStatus) {
         this.followerInitialSyncStatus = followerInitialSyncStatus;
     }
@@ -346,17 +312,11 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
 
     @Override
     public String getPeerAddresses() {
-        StringBuilder builder = new StringBuilder();
-        int i = 0;
-        for(Map.Entry<String, String> e: getOnDemandRaftState().getPeerAddresses().entrySet()) {
-            if(i++ > 0) {
-                builder.append(", ");
-            }
-
-            builder.append(e.getKey()).append(": ").append(e.getValue());
-        }
+        return toStringMap(getOnDemandRaftState().getPeerAddresses());
+    }
 
-        return builder.toString();
+    private static String toStringMap(Map<?, ?> map) {
+        return Joiner.on(", ").withKeyValueSeparator(": ").join(map);
     }
 
     @Override
@@ -385,4 +345,21 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
     public String getLastLeadershipChangeTime() {
         return DATE_FORMAT.format(new Date(lastLeadershipChangeTime));
     }
+
+    @Override
+    public int getPendingTxCommitQueueSize() {
+        return shard.getPendingTxCommitQueueSize();
+    }
+
+    @Override
+    public int getTxCohortCacheSize() {
+        return shard.getCohortCacheSize();
+    }
+
+    @Override
+    public void captureSnapshot() {
+        if(shard != null) {
+            shard.getSelf().tell(new InitiateCaptureSnapshot(), ActorRef.noSender());
+        }
+    }
 }