Cache MapJoiner

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / jmx / mbeans / shard / ShardStats.java

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 b01eb099a5707975515c00d7c661725ff8f16400..765fe211d2ef59f6cdb02d64ad4a7a1af17b2a3d 100644 (file)
--- 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
@@ -12,15 +12,16 @@ import akka.actor.ActorRef;
 import akka.pattern.Patterns;
 import akka.util.Timeout;
 import com.google.common.base.Joiner;
 import akka.pattern.Patterns;
 import akka.util.Timeout;
 import com.google.common.base.Joiner;

+import com.google.common.base.Joiner.MapJoiner;

 import com.google.common.base.Stopwatch;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import com.google.common.base.Stopwatch;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;

-import java.util.Map;

 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;

+import javax.annotation.Nullable;

 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.datastore.Shard;
 import org.opendaylight.controller.cluster.raft.base.messages.InitiateCaptureSnapshot;
 import org.opendaylight.controller.cluster.raft.client.messages.FollowerInfo;


@@ -35,13 +36,15 @@ import scala.concurrent.Await;
  * @author  Basheeruddin syedbahm@cisco.com
  */
 public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
  * @author  Basheeruddin syedbahm@cisco.com
  */
 public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {

-    public static String JMX_CATEGORY_SHARD = "Shards";
+    public static final String JMX_CATEGORY_SHARD = "Shards";

 
     private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
 
 
     private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
 

-    private static final Cache<String, OnDemandRaftState> onDemandRaftStateCache =
+    private static final Cache<String, OnDemandRaftState> ONDEMAND_RAFT_STATE_CACHE =

             CacheBuilder.newBuilder().expireAfterWrite(2, TimeUnit.SECONDS).build();
 
             CacheBuilder.newBuilder().expireAfterWrite(2, TimeUnit.SECONDS).build();
 

+    private static final MapJoiner MAP_JOINER = Joiner.on(", ").withKeyValueSeparator(": ");
+

     private long committedTransactionsCount;
 
     private long readOnlyTransactionCount;
     private long committedTransactionsCount;
 
     private long readOnlyTransactionCount;


@@ -60,7 +63,7 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
 
     private boolean followerInitialSyncStatus = false;
 
 
     private boolean followerInitialSyncStatus = false;
 

-    private Shard shard;
+    private final Shard shard;

 
     private String statRetrievalError;
 
 
     private String statRetrievalError;
 


@@ -70,22 +73,20 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
 
     private long lastLeadershipChangeTime;
 
 
     private long lastLeadershipChangeTime;
 

-    public ShardStats(final String shardName, final String mxBeanType) {
+    public ShardStats(final String shardName, final String mxBeanType, @Nullable final Shard shard) {

         super(shardName, mxBeanType, JMX_CATEGORY_SHARD);
         super(shardName, mxBeanType, JMX_CATEGORY_SHARD);

-    }
-
-    public void setShard(Shard shard) {

         this.shard = shard;
     }
 
         this.shard = shard;
     }
 

+    @SuppressWarnings("checkstyle:IllegalCatch")

     private OnDemandRaftState getOnDemandRaftState() {
         String name = getShardName();
     private OnDemandRaftState getOnDemandRaftState() {
         String name = getShardName();

-        OnDemandRaftState state = onDemandRaftStateCache.getIfPresent(name);
-        if(state == null) {
+        OnDemandRaftState state = ONDEMAND_RAFT_STATE_CACHE.getIfPresent(name);
+        if (state == null) {

             statRetrievalError = null;
             statRetrievalTime = null;
 
             statRetrievalError = null;
             statRetrievalTime = null;
 

-            if(shard != null) {
+            if (shard != null) {

                 Timeout timeout = new Timeout(10, TimeUnit.SECONDS);
                 try {
                     Stopwatch timer = Stopwatch.createStarted();
                 Timeout timeout = new Timeout(10, TimeUnit.SECONDS);
                 try {
                     Stopwatch timer = Stopwatch.createStarted();


@@ -94,7 +95,7 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
                             GetOnDemandRaftState.INSTANCE, timeout), timeout.duration());
 
                     statRetrievalTime = timer.stop().toString();
                             GetOnDemandRaftState.INSTANCE, timeout), timeout.duration());
 
                     statRetrievalTime = timer.stop().toString();

-                    onDemandRaftStateCache.put(name, state);
+                    ONDEMAND_RAFT_STATE_CACHE.put(name, state);

                 } catch (Exception e) {
                     statRetrievalError = e.toString();
                 }
                 } catch (Exception e) {
                     statRetrievalError = e.toString();
                 }


@@ -195,6 +196,7 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
     public String getVotedFor() {
         return getOnDemandRaftState().getVotedFor();
     }
     public String getVotedFor() {
         return getOnDemandRaftState().getVotedFor();
     }

+

     @Override
     public boolean isVoting() {
         return getOnDemandRaftState().isVoting();
     @Override
     public boolean isVoting() {
         return getOnDemandRaftState().isVoting();


@@ -202,7 +204,7 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
 
     @Override
     public String getPeerVotingStates() {
 
     @Override
     public String getPeerVotingStates() {

-        return toStringMap(getOnDemandRaftState().getPeerVotingStates());
+        return MAP_JOINER.join(getOnDemandRaftState().getPeerVotingStates());

     }
 
     @Override
     }
 
     @Override


@@ -212,7 +214,9 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
 
     @Override
     public String getLastCommittedTransactionTime() {
 
     @Override
     public String getLastCommittedTransactionTime() {

-        return DATE_FORMAT.format(new Date(lastCommittedTransactionTime));
+        synchronized (DATE_FORMAT) {
+            return DATE_FORMAT.format(new Date(lastCommittedTransactionTime));
+        }

     }
 
     @Override
     }
 
     @Override


@@ -254,8 +258,7 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
         return failedReadTransactionsCount.incrementAndGet();
     }
 
         return failedReadTransactionsCount.incrementAndGet();
     }
 

-    public long incrementAbortTransactionsCount ()
-    {
+    public long incrementAbortTransactionsCount() {

         return ++abortTransactionsCount;
     }
 
         return ++abortTransactionsCount;
     }
 


@@ -264,7 +267,7 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
     }
 
     @Override
     }
 
     @Override

-    public long getInMemoryJournalDataSize(){
+    public long getInMemoryJournalDataSize() {

         return getOnDemandRaftState().getInMemoryJournalDataSize();
     }
 
         return getOnDemandRaftState().getInMemoryJournalDataSize();
     }
 


@@ -274,10 +277,10 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
     }
 
     /**
     }
 
     /**

-     * resets the counters related to transactions
+     * Resets the counters related to transactions.

      */
     @Override
      */
     @Override

-    public void resetTransactionCounters(){
+    public void resetTransactionCounters() {

         committedTransactionsCount = 0;
 
         readOnlyTransactionCount = 0;
         committedTransactionsCount = 0;
 
         readOnlyTransactionCount = 0;


@@ -312,11 +315,7 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
 
     @Override
     public String getPeerAddresses() {
 
     @Override
     public String getPeerAddresses() {

-        return toStringMap(getOnDemandRaftState().getPeerAddresses());
-    }
-
-    private static String toStringMap(Map<?, ?> map) {
-        return Joiner.on(", ").withKeyValueSeparator(": ").join(map);
+        return MAP_JOINER.join(getOnDemandRaftState().getPeerAddresses());

     }
 
     @Override
     }
 
     @Override


@@ -343,22 +342,24 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean {
 
     @Override
     public String getLastLeadershipChangeTime() {
 
     @Override
     public String getLastLeadershipChangeTime() {

-        return DATE_FORMAT.format(new Date(lastLeadershipChangeTime));
+        synchronized (DATE_FORMAT) {
+            return DATE_FORMAT.format(new Date(lastLeadershipChangeTime));
+        }

     }
 
     @Override
     public int getPendingTxCommitQueueSize() {
     }
 
     @Override
     public int getPendingTxCommitQueueSize() {

-        return shard.getPendingTxCommitQueueSize();
+        return shard != null ? shard.getPendingTxCommitQueueSize() : -1;

     }
 
     @Override
     public int getTxCohortCacheSize() {
     }
 
     @Override
     public int getTxCohortCacheSize() {

-        return shard.getCohortCacheSize();
+        return shard != null ? shard.getCohortCacheSize() : -1;

     }
 
     @Override
     public void captureSnapshot() {
     }
 
     @Override
     public void captureSnapshot() {

-        if(shard != null) {
+        if (shard != null) {

             shard.getSelf().tell(new InitiateCaptureSnapshot(), ActorRef.noSender());
         }
     }
             shard.getSelf().tell(new InitiateCaptureSnapshot(), ActorRef.noSender());
         }
     }