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=577a03c3a35ae018d4f33ecdc7bedb30022c474e;hp=0959c2a95949a6332fd66859f0796e103746c5d8;hb=e4e87498e57cd4fc6f24cc7aac0412975844e66a;hpb=0ef97b34b82e9987ada3ad2a318fd03731385aa4 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 0959c2a959..577a03c3a3 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 @@ -8,20 +8,18 @@ package org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; -import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicLong; - 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 java.text.SimpleDateFormat; -import java.util.Date; - /** * Maintains statistics for a shard. * @@ -30,54 +28,52 @@ import java.util.Date; public class ShardStats extends AbstractMXBean implements ShardStatsMXBean { public static String JMX_CATEGORY_SHARD = "Shards"; - private final AtomicLong committedTransactionsCount = new AtomicLong(); + private long committedTransactionsCount; - private final AtomicLong readOnlyTransactionCount = new AtomicLong(); + private long readOnlyTransactionCount; - private final AtomicLong writeOnlyTransactionCount = new AtomicLong(); + private long writeOnlyTransactionCount; - private final AtomicLong readWriteTransactionCount = new AtomicLong(); + private long readWriteTransactionCount; private String leader; private String raftState; - private volatile long lastLogTerm = -1L; + private long lastLogTerm = -1L; - private volatile long lastLogIndex = -1L; + private long lastLogIndex = -1L; - private volatile long currentTerm = -1L; + private long currentTerm = -1L; - private volatile long commitIndex = -1L; + private long commitIndex = -1L; - private volatile long lastApplied = -1L; + private long lastApplied = -1L; - private volatile long lastCommittedTransactionTime; + private long lastCommittedTransactionTime; - private final AtomicLong failedTransactionsCount = new AtomicLong(); + private long failedTransactionsCount; private final AtomicLong failedReadTransactionsCount = new AtomicLong(); - private final AtomicLong abortTransactionsCount = new AtomicLong(); + private long abortTransactionsCount; private ThreadExecutorStatsMXBeanImpl notificationExecutorStatsBean; - private ThreadExecutorStatsMXBeanImpl dataStoreExecutorStatsBean; - private QueuedNotificationManagerMXBeanImpl notificationManagerStatsBean; + private long dataSize = 0; + private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); - public ShardStats(String shardName, String mxBeanType) { - super(shardName, mxBeanType, JMX_CATEGORY_SHARD); - } + private boolean followerInitialSyncStatus = false; - public void setDataStoreExecutor(ExecutorService dsExecutor) { - this.dataStoreExecutorStatsBean = ThreadExecutorStatsMXBeanImpl.create(dsExecutor); + public ShardStats(final String shardName, final String mxBeanType) { + super(shardName, mxBeanType, JMX_CATEGORY_SHARD); } - public void setNotificationManager(QueuedNotificationManager manager) { + public void setNotificationManager(final QueuedNotificationManager manager) { this.notificationManagerStatsBean = new QueuedNotificationManagerMXBeanImpl(manager, "notification-manager", getMBeanType(), getMBeanCategory()); @@ -91,7 +87,7 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean { @Override public long getCommittedTransactionsCount() { - return committedTransactionsCount.get(); + return committedTransactionsCount; } @Override @@ -106,17 +102,17 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean { @Override public long getReadOnlyTransactionCount() { - return readOnlyTransactionCount.get(); + return readOnlyTransactionCount; } @Override public long getWriteOnlyTransactionCount() { - return writeOnlyTransactionCount.get(); + return writeOnlyTransactionCount; } @Override public long getReadWriteTransactionCount() { - return readWriteTransactionCount.get(); + return readWriteTransactionCount; } @Override @@ -152,7 +148,7 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean { @Override public long getFailedTransactionsCount() { - return failedTransactionsCount.get(); + return failedTransactionsCount; } @Override @@ -162,27 +158,27 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean { @Override public long getAbortTransactionsCount() { - return abortTransactionsCount.get(); + return abortTransactionsCount; } public long incrementCommittedTransactionCount() { - return committedTransactionsCount.incrementAndGet(); + return ++committedTransactionsCount; } public long incrementReadOnlyTransactionCount() { - return readOnlyTransactionCount.incrementAndGet(); + return ++readOnlyTransactionCount; } public long incrementWriteOnlyTransactionCount() { - return writeOnlyTransactionCount.incrementAndGet(); + return ++writeOnlyTransactionCount; } public long incrementReadWriteTransactionCount() { - return readWriteTransactionCount.incrementAndGet(); + return ++readWriteTransactionCount; } public long incrementFailedTransactionsCount() { - return failedTransactionsCount.incrementAndGet(); + return ++failedTransactionsCount; } public long incrementFailedReadTransactionsCount() { @@ -191,45 +187,54 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean { public long incrementAbortTransactionsCount () { - return abortTransactionsCount.incrementAndGet(); + return ++abortTransactionsCount; } - public void setLeader(String leader) { + public void setLeader(final String leader) { this.leader = leader; } - public void setRaftState(String raftState) { + public void setRaftState(final String raftState) { this.raftState = raftState; } - public void setLastLogTerm(long lastLogTerm) { + public void setLastLogTerm(final long lastLogTerm) { this.lastLogTerm = lastLogTerm; } - public void setLastLogIndex(long lastLogIndex) { + public void setLastLogIndex(final long lastLogIndex) { this.lastLogIndex = lastLogIndex; } - public void setCurrentTerm(long currentTerm) { + public void setCurrentTerm(final long currentTerm) { this.currentTerm = currentTerm; } - public void setCommitIndex(long commitIndex) { + public void setCommitIndex(final long commitIndex) { this.commitIndex = commitIndex; } - public void setLastApplied(long lastApplied) { + public void setLastApplied(final long lastApplied) { this.lastApplied = lastApplied; } - public void setLastCommittedTransactionTime(long lastCommittedTransactionTime) { + public void setLastCommittedTransactionTime(final long lastCommittedTransactionTime) { this.lastCommittedTransactionTime = lastCommittedTransactionTime; } + public void setInMemoryJournalDataSize(long dataSize){ + this.dataSize = dataSize; + } + + @Override + public long getInMemoryJournalDataSize(){ + return dataSize; + } + @Override public ThreadExecutorStats getDataStoreExecutorStats() { - return dataStoreExecutorStatsBean == null ? null : - dataStoreExecutorStatsBean.toThreadExecutorStats(); + // FIXME: this particular thing does not work, as it really is DS-specific + return null; } @Override @@ -252,21 +257,34 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean { */ @Override public void resetTransactionCounters(){ - committedTransactionsCount.set(0); + committedTransactionsCount = 0; - readOnlyTransactionCount.set(0); + readOnlyTransactionCount = 0; - writeOnlyTransactionCount.set(0); + writeOnlyTransactionCount = 0; - readWriteTransactionCount.set(0); + readWriteTransactionCount = 0; lastCommittedTransactionTime = 0; - failedTransactionsCount.set(0); + failedTransactionsCount = 0; failedReadTransactionsCount.set(0); - abortTransactionsCount.set(0); + abortTransactionsCount = 0; + + } + public void setDataStore(final InMemoryDOMDataStore store) { + setNotificationManager(store.getDataChangeListenerNotificationManager()); + } + + public void setFollowerInitialSyncStatus(boolean followerInitialSyncStatus) { + this.followerInitialSyncStatus = followerInitialSyncStatus; + } + + @Override + public boolean getFollowerInitialSyncStatus() { + return followerInitialSyncStatus; } }