From: Moiz Raja Date: Thu, 7 Aug 2014 19:13:49 +0000 (-0700) Subject: Expose more information about a Shard via JMX X-Git-Tag: release/helium~313^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=3e35e82b3b253de08e3ea07d2af8b2c1696272e9 Expose more information about a Shard via JMX Change-Id: I4185cbf9d1399b90aa7b635bdbb4a82bce122a1a Signed-off-by: Moiz Raja --- diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java index 0a979d24ee..a0bb004607 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java @@ -295,6 +295,22 @@ public abstract class RaftActor extends UntypedPersistentActor { return currentBehavior.state(); } + protected ReplicatedLogEntry getLastLogEntry() { + return replicatedLog.last(); + } + + protected Long getCurrentTerm(){ + return context.getTermInformation().getCurrentTerm(); + } + + protected Long getCommitIndex(){ + return context.getCommitIndex(); + } + + protected Long getLastApplied(){ + return context.getLastApplied(); + } + /** * setPeerAddress sets the address of a known peer at a later time. *

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java index 0a553b40fd..707c5321f5 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java @@ -301,7 +301,7 @@ public abstract class AbstractRaftActorBehavior implements RaftActorBehavior { * * @param index a log index that is known to be committed */ - protected void applyLogToStateMachine(long index) { + protected void applyLogToStateMachine(final long index) { // Now maybe we apply to the state machine for (long i = context.getLastApplied() + 1; i < index + 1; i++) { @@ -326,6 +326,7 @@ public abstract class AbstractRaftActorBehavior implements RaftActorBehavior { } // Send a local message to the local RaftActor (it's derived class to be // specific to apply the log to it's index) + context.getLogger().info("Setting last applied to {}", index); context.setLastApplied(index); } diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Leader.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Leader.java index a50666233c..8b95e8b7a6 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Leader.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Leader.java @@ -19,7 +19,6 @@ import org.opendaylight.controller.cluster.raft.FollowerLogInformationImpl; import org.opendaylight.controller.cluster.raft.RaftActorContext; import org.opendaylight.controller.cluster.raft.RaftState; import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry; -import org.opendaylight.controller.cluster.raft.base.messages.ApplyState; import org.opendaylight.controller.cluster.raft.base.messages.Replicate; import org.opendaylight.controller.cluster.raft.base.messages.SendHeartBeat; import org.opendaylight.controller.cluster.raft.base.messages.SendInstallSnapshot; @@ -264,26 +263,18 @@ public class Leader extends AbstractRaftActorBehavior { context.getLogger().debug("Replicate message " + logIndex); + // Create a tracker entry we will use this later to notify the + // client actor + trackerList.add( + new ClientRequestTrackerImpl(replicate.getClientActor(), + replicate.getIdentifier(), + logIndex) + ); + if (followers.size() == 0) { - context.setCommitIndex( - replicate.getReplicatedLogEntry().getIndex()); - - context.getActor() - .tell(new ApplyState(replicate.getClientActor(), - replicate.getIdentifier(), - replicate.getReplicatedLogEntry()), - context.getActor() - ); + context.setCommitIndex(logIndex); + applyLogToStateMachine(logIndex); } else { - - // Create a tracker entry we will use this later to notify the - // client actor - trackerList.add( - new ClientRequestTrackerImpl(replicate.getClientActor(), - replicate.getIdentifier(), - logIndex) - ); - sendAppendEntries(); } } diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java index d33b33925b..17c22a134a 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java @@ -8,6 +8,7 @@ import org.junit.Test; import org.opendaylight.controller.cluster.raft.MockRaftActorContext; import org.opendaylight.controller.cluster.raft.RaftActorContext; import org.opendaylight.controller.cluster.raft.RaftState; +import org.opendaylight.controller.cluster.raft.ReplicatedLogImplEntry; import org.opendaylight.controller.cluster.raft.base.messages.ApplyState; import org.opendaylight.controller.cluster.raft.base.messages.Replicate; import org.opendaylight.controller.cluster.raft.base.messages.SendHeartBeat; @@ -154,18 +155,25 @@ public class LeaderTest extends AbstractRaftActorBehaviorTest { MockRaftActorContext actorContext = new MockRaftActorContext("test", getSystem(), raftActor); + actorContext.getReplicatedLog().removeFrom(0); + + actorContext.getReplicatedLog().append(new ReplicatedLogImplEntry(0, 1, + new MockRaftActorContext.MockPayload("foo"))); + + ReplicatedLogImplEntry entry = + new ReplicatedLogImplEntry(1, 1, + new MockRaftActorContext.MockPayload("foo")); + + actorContext.getReplicatedLog().append(entry); + Leader leader = new Leader(actorContext); RaftState raftState = leader - .handleMessage(senderActor, new Replicate(null, "state-id", - new MockRaftActorContext.MockReplicatedLogEntry(1, - 100, - new MockRaftActorContext.MockPayload("foo")) - )); + .handleMessage(senderActor, new Replicate(null, "state-id",entry)); // State should not change assertEquals(RaftState.Leader, raftState); - assertEquals(100, actorContext.getCommitIndex()); + assertEquals(1, actorContext.getCommitIndex()); final String out = new ExpectMsg(duration("1 seconds"), diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java index 10dbbc84d8..0717598f0c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java @@ -37,6 +37,7 @@ import org.opendaylight.controller.cluster.datastore.modification.MutableComposi import org.opendaylight.controller.cluster.raft.ConfigParams; import org.opendaylight.controller.cluster.raft.DefaultConfigParamsImpl; import org.opendaylight.controller.cluster.raft.RaftActor; +import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeListener; import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction; @@ -107,7 +108,8 @@ public class Shard extends RaftActor { } - public static Props props(final String name, final Map peerAddresses) { + public static Props props(final String name, + final Map peerAddresses) { return Props.create(new Creator() { @Override @@ -119,13 +121,15 @@ public class Shard extends RaftActor { } - @Override public void onReceiveCommand(Object message){ - LOG.debug("Received message {} from {}", message.getClass().toString(), getSender()); + @Override public void onReceiveCommand(Object message) { + LOG.debug("Received message {} from {}", message.getClass().toString(), + getSender()); - if (message.getClass().equals(CreateTransactionChain.SERIALIZABLE_CLASS)) { - if(isLeader()) { + if (message.getClass() + .equals(CreateTransactionChain.SERIALIZABLE_CLASS)) { + if (isLeader()) { createTransactionChain(); - } else if(getLeader() != null){ + } else if (getLeader() != null) { getLeader().forward(message, getContext()); } } else if (message instanceof RegisterChangeListener) { @@ -134,51 +138,73 @@ public class Shard extends RaftActor { updateSchemaContext((UpdateSchemaContext) message); } else if (message instanceof ForwardedCommitTransaction) { handleForwardedCommit((ForwardedCommitTransaction) message); - } else if (message.getClass().equals(CreateTransaction.SERIALIZABLE_CLASS)) { - if(isLeader()) { + } else if (message.getClass() + .equals(CreateTransaction.SERIALIZABLE_CLASS)) { + if (isLeader()) { createTransaction(CreateTransaction.fromSerializable(message)); - } else if(getLeader() != null){ + } else if (getLeader() != null) { getLeader().forward(message, getContext()); } - } else if (message instanceof PeerAddressResolved){ + } else if (message instanceof PeerAddressResolved) { PeerAddressResolved resolved = (PeerAddressResolved) message; setPeerAddress(resolved.getPeerId(), resolved.getPeerAddress()); } else { - super.onReceiveCommand(message); + super.onReceiveCommand(message); } } - private ActorRef createTypedTransactionActor(CreateTransaction createTransaction,String transactionId){ - if(createTransaction.getTransactionType()== TransactionProxy.TransactionType.READ_ONLY.ordinal()){ - return getContext().actorOf( - ShardTransaction.props( store.newReadOnlyTransaction(), getSelf(), schemaContext), transactionId); - - }else if (createTransaction.getTransactionType()== TransactionProxy.TransactionType.READ_WRITE.ordinal()){ - return getContext().actorOf( - ShardTransaction.props( store.newReadWriteTransaction(), getSelf(), schemaContext), transactionId); - - - }else if (createTransaction.getTransactionType()== TransactionProxy.TransactionType.WRITE_ONLY.ordinal()){ - return getContext().actorOf( - ShardTransaction.props( store.newWriteOnlyTransaction(), getSelf(), schemaContext), transactionId); - }else{ - throw new IllegalArgumentException ("CreateTransaction message has unidentified transaction type="+createTransaction.getTransactionType()) ; - } - } + private ActorRef createTypedTransactionActor( + CreateTransaction createTransaction, String transactionId) { + if (createTransaction.getTransactionType() + == TransactionProxy.TransactionType.READ_ONLY.ordinal()) { + shardMBean.incrementReadOnlyTransactionCount(); + return getContext().actorOf( + ShardTransaction + .props(store.newReadOnlyTransaction(), getSelf(), + schemaContext), transactionId); + + } else if (createTransaction.getTransactionType() + == TransactionProxy.TransactionType.READ_WRITE.ordinal()) { + shardMBean.incrementReadWriteTransactionCount(); + return getContext().actorOf( + ShardTransaction + .props(store.newReadWriteTransaction(), getSelf(), + schemaContext), transactionId); + + + } else if (createTransaction.getTransactionType() + == TransactionProxy.TransactionType.WRITE_ONLY.ordinal()) { + shardMBean.incrementWriteOnlyTransactionCount(); + return getContext().actorOf( + ShardTransaction + .props(store.newWriteOnlyTransaction(), getSelf(), + schemaContext), transactionId); + } else { + throw new IllegalArgumentException( + "CreateTransaction message has unidentified transaction type=" + + createTransaction.getTransactionType()); + } + } private void createTransaction(CreateTransaction createTransaction) { String transactionId = "shard-" + createTransaction.getTransactionId(); - LOG.info("Creating transaction : {} " , transactionId); - ActorRef transactionActor = createTypedTransactionActor(createTransaction,transactionId); + LOG.info("Creating transaction : {} ", transactionId); + ActorRef transactionActor = + createTypedTransactionActor(createTransaction, transactionId); getSender() - .tell(new CreateTransactionReply(Serialization.serializedActorPath(transactionActor), createTransaction.getTransactionId()).toSerializable(), - getSelf()); + .tell(new CreateTransactionReply( + Serialization.serializedActorPath(transactionActor), + createTransaction.getTransactionId()).toSerializable(), + getSelf() + ); } private void commit(final ActorRef sender, Object serialized) { - Modification modification = MutableCompositeModification.fromSerializable(serialized, schemaContext); + Modification modification = + MutableCompositeModification.fromSerializable( + serialized, schemaContext); DOMStoreThreePhaseCommitCohort cohort = modificationToCohort.remove(serialized); if (cohort == null) { @@ -211,7 +237,7 @@ public class Shard extends RaftActor { try { future.get(); - if(sender != null) { + if (sender != null) { sender .tell(new CommitTransactionReply().toSerializable(), self); @@ -227,13 +253,15 @@ public class Shard extends RaftActor { } private void handleForwardedCommit(ForwardedCommitTransaction message) { - Object serializedModification = message.getModification().toSerializable(); + Object serializedModification = + message.getModification().toSerializable(); modificationToCohort - .put(serializedModification , message.getCohort()); + .put(serializedModification, message.getCohort()); - if(persistent) { - this.persistData(getSender(), "identifier", new CompositeModificationPayload(serializedModification)); + if (persistent) { + this.persistData(getSender(), "identifier", + new CompositeModificationPayload(serializedModification)); } else { this.commit(getSender(), serializedModification); } @@ -247,7 +275,8 @@ public class Shard extends RaftActor { private void registerChangeListener( RegisterChangeListener registerChangeListener) { - LOG.debug("registerDataChangeListener for " + registerChangeListener.getPath()); + LOG.debug("registerDataChangeListener for " + registerChangeListener + .getPath()); ActorSelection dataChangeListenerPath = getContext() @@ -258,14 +287,16 @@ public class Shard extends RaftActor { // Notify the listener if notifications should be enabled or not // If this shard is the leader then it will enable notifications else // it will not - dataChangeListenerPath.tell(new EnableNotification(isLeader()), getSelf()); + dataChangeListenerPath + .tell(new EnableNotification(isLeader()), getSelf()); // Now store a reference to the data change listener so it can be notified // at a later point if notifications should be enabled or disabled dataChangeListeners.add(dataChangeListenerPath); AsyncDataChangeListener> - listener = new DataChangeListenerProxy(schemaContext,dataChangeListenerPath); + listener = + new DataChangeListenerProxy(schemaContext, dataChangeListenerPath); org.opendaylight.yangtools.concepts.ListenerRegistration>> registration = @@ -275,7 +306,9 @@ public class Shard extends RaftActor { getContext().actorOf( DataChangeListenerRegistration.props(registration)); - LOG.debug("registerDataChangeListener sending reply, listenerRegistrationPath = " + listenerRegistration.path().toString()); + LOG.debug( + "registerDataChangeListener sending reply, listenerRegistrationPath = " + + listenerRegistration.path().toString()); getSender() .tell(new RegisterChangeListenerReply(listenerRegistration.path()), @@ -289,18 +322,19 @@ public class Shard extends RaftActor { ShardTransactionChain.props(chain, schemaContext)); getSender() .tell(new CreateTransactionChainReply(transactionChain.path()) - .toSerializable(), - getSelf()); + .toSerializable(), + getSelf() + ); } @Override protected void applyState(ActorRef clientActor, String identifier, Object data) { - if(data instanceof CompositeModificationPayload){ + if (data instanceof CompositeModificationPayload) { Object modification = ((CompositeModificationPayload) data).getModification(); - if(modification != null){ + if (modification != null) { commit(clientActor, modification); } else { LOG.error("modification is null - this is very unexpected"); @@ -311,6 +345,16 @@ public class Shard extends RaftActor { LOG.error("Unknown state received {}", data); } + ReplicatedLogEntry lastLogEntry = getLastLogEntry(); + + if(lastLogEntry != null){ + shardMBean.setLastLogIndex(lastLogEntry.getIndex()); + shardMBean.setLastLogTerm(lastLogEntry.getTerm()); + } + + shardMBean.setCommitIndex(getCommitIndex()); + shardMBean.setLastApplied(getLastApplied()); + } @Override protected Object createSnapshot() { @@ -322,15 +366,17 @@ public class Shard extends RaftActor { } @Override protected void onStateChanged() { - for(ActorSelection dataChangeListener : dataChangeListeners){ - dataChangeListener.tell(new EnableNotification(isLeader()), getSelf()); + for (ActorSelection dataChangeListener : dataChangeListeners) { + dataChangeListener + .tell(new EnableNotification(isLeader()), getSelf()); } - if(getLeaderId() != null){ + if (getLeaderId() != null) { shardMBean.setLeader(getLeaderId()); } shardMBean.setRaftState(getRaftState().name()); + shardMBean.setCurrentTerm(getCurrentTerm()); } @Override public String persistenceId() { 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 4eb6a8cef9..09bf00ddfd 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 @@ -6,81 +6,144 @@ import org.opendaylight.controller.cluster.datastore.jmx.mbeans.AbstractBaseMBea * @author: syedbahm */ public class ShardStats extends AbstractBaseMBean implements ShardStatsMBean { - private Long committedTransactionsCount; - private Long journalMessagesCount; - final private String shardName; - private String leader; - private String raftState; - ShardStats(String shardName){ - this.shardName = shardName; - committedTransactionsCount =0L; - journalMessagesCount = 0L; - }; + private final String shardName; + private Long committedTransactionsCount = 0L; - @Override - public String getShardName() { - return shardName; - } + private Long readOnlyTransactionCount = 0L; - @Override - public Long getCommittedTransactionsCount() { - return committedTransactionsCount; - } + private Long writeOnlyTransactionCount = 0L; - @Override - public Long getJournalMessagesCount() { - //FIXME: this will be populated once after integration with Raft stuff - return journalMessagesCount; - } + private Long readWriteTransactionCount = 0L; - @Override public String getLeader() { - return leader; - } + private String leader; - @Override public String getRaftState() { - return raftState; - } + private String raftState; - public Long incrementCommittedTransactionCount() { - return committedTransactionsCount++; - } + private Long lastLogTerm = -1L; + private Long lastLogIndex = -1L; - public void updateCommittedTransactionsCount(long currentCount){ - committedTransactionsCount = currentCount; + private Long currentTerm = -1L; - } + private Long commitIndex = -1L; - public void updateJournalMessagesCount(long currentCount){ - journalMessagesCount = currentCount; + private Long lastApplied = -1L; - } + ShardStats(String shardName) { + this.shardName = shardName; + } - public void setLeader(String leader){ - this.leader = leader; - } - public void setRaftState(String raftState){ - this.raftState = raftState; - } + @Override + public String getShardName() { + return shardName; + } + @Override + public Long getCommittedTransactionsCount() { + return committedTransactionsCount; + } - @Override - protected String getMBeanName() { - return shardName; - } + @Override public String getLeader() { + return leader; + } - @Override - protected String getMBeanType() { - return JMX_TYPE_DISTRIBUTED_DATASTORE; - } + @Override public String getRaftState() { + return raftState; + } - @Override - protected String getMBeanCategory() { - return JMX_CATEGORY_SHARD; - } + @Override public Long getReadOnlyTransactionCount() { + return readOnlyTransactionCount; + } + + @Override public Long getWriteOnlyTransactionCount() { + return writeOnlyTransactionCount; + } + + @Override public Long getReadWriteTransactionCount() { + return readWriteTransactionCount; + } + + @Override public Long getLastLogIndex() { + return lastLogIndex; + } + + @Override public Long getLastLogTerm() { + return lastLogTerm; + } + + @Override public Long getCurrentTerm() { + return currentTerm; + } + + @Override public Long getCommitIndex() { + return commitIndex; + } + + @Override public Long getLastApplied() { + return lastApplied; + } + + public Long incrementCommittedTransactionCount() { + return committedTransactionsCount++; + } + + public Long incrementReadOnlyTransactionCount() { + return readOnlyTransactionCount++; + } + + public Long incrementWriteOnlyTransactionCount() { + return writeOnlyTransactionCount++; + } + + public Long incrementReadWriteTransactionCount() { + return readWriteTransactionCount++; + } + + public void setLeader(String leader) { + this.leader = leader; + } + + public void setRaftState(String raftState) { + this.raftState = raftState; + } + + public void setLastLogTerm(Long lastLogTerm) { + this.lastLogTerm = lastLogTerm; + } + + public void setLastLogIndex(Long lastLogIndex) { + this.lastLogIndex = lastLogIndex; + } + + public void setCurrentTerm(Long currentTerm) { + this.currentTerm = currentTerm; + } + + public void setCommitIndex(Long commitIndex) { + this.commitIndex = commitIndex; + } + + public void setLastApplied(Long lastApplied) { + this.lastApplied = lastApplied; + } + + @Override + protected String getMBeanName() { + return shardName; + } + + @Override + protected String getMBeanType() { + return JMX_TYPE_DISTRIBUTED_DATASTORE; + } + + @Override + protected String getMBeanCategory() { + return JMX_CATEGORY_SHARD; + } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStatsMBean.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStatsMBean.java index 9ebcc7fa5a..d5530653fd 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStatsMBean.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStatsMBean.java @@ -4,9 +4,27 @@ package org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard; * @author: syedbahm */ public interface ShardStatsMBean { - String getShardName(); - Long getCommittedTransactionsCount(); - Long getJournalMessagesCount(); - String getLeader(); - String getRaftState(); + String getShardName(); + + Long getCommittedTransactionsCount(); + + String getLeader(); + + String getRaftState(); + + Long getReadOnlyTransactionCount(); + + Long getWriteOnlyTransactionCount(); + + Long getReadWriteTransactionCount(); + + Long getLastLogIndex(); + + Long getLastLogTerm(); + + Long getCurrentTerm(); + + Long getCommitIndex(); + + Long getLastApplied(); }