Merge "Bug 1446: Add JMX stats for clustered data store"

diff --cc opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java
index b40ccd0,a3393a4..7d57004
--- 1/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java
--- 2/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
@@@ -130,12 -117,10 +129,14 @@@ public class Shard extends RaftActor 
          store = InMemoryDOMDataStoreFactory.create(name.toString(), null,
                  datastoreContext.getDataStoreProperties());
  
-         shardMBean = ShardMBeanFactory.getShardStatsMBean(name.toString());
- 
 +        if(schemaContext != null) {
 +            store.onGlobalContextUpdated(schemaContext);
 +        }
 +
+         shardMBean = ShardMBeanFactory.getShardStatsMBean(name.toString(),
+                 datastoreContext.getDataStoreMXBeanType());
+         shardMBean.setDataStoreExecutor(store.getDomStoreExecutor());
+         shardMBean.setNotificationManager(store.getDataChangeListenerNotificationManager());
  
      }
  
@@@ -230,19 -200,19 +231,19 @@@
  
              return getContext().actorOf(
                  ShardTransaction.props(store.newReadOnlyTransaction(), getSelf(),
-                         schemaContext,datastoreContext, name.toString()), transactionId.toString());
+                         schemaContext,datastoreContext, shardMBean), transactionId.toString());
  
 -        } else if (createTransaction.getTransactionType()
 +        } else if (transactionType
              == TransactionProxy.TransactionType.READ_WRITE.ordinal()) {
  
              shardMBean.incrementReadWriteTransactionCount();
  
              return getContext().actorOf(
                  ShardTransaction.props(store.newReadWriteTransaction(), getSelf(),
-                         schemaContext, datastoreContext,name.toString()), transactionId.toString());
+                         schemaContext, datastoreContext, shardMBean), transactionId.toString());
  
  
 -        } else if (createTransaction.getTransactionType()
 +        } else if (transactionType
              == TransactionProxy.TransactionType.WRITE_ONLY.ordinal()) {
  
              shardMBean.incrementWriteOnlyTransactionCount();
@@@ -403,9 -359,9 +404,9 @@@
      private void createTransactionChain() {
          DOMStoreTransactionChain chain = store.createTransactionChain();
          ActorRef transactionChain = getContext().actorOf(
-                 ShardTransactionChain.props(chain, schemaContext, datastoreContext,name.toString() ));
+                 ShardTransactionChain.props(chain, schemaContext, datastoreContext, shardMBean));
          getSender().tell(new CreateTransactionChainReply(transactionChain.path()).toSerializable(),
 -                getSelf());
 +            getSelf());
      }
  
      @Override protected void applyState(ActorRef clientActor, String identifier,

diff --cc opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java
Simple merge

diff --cc opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java
index 4e73c70,eea7352..869f475
--- 1/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java
--- 2/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java
@@@ -72,9 -71,10 +75,9 @@@ public class ShardTransactionFailureTes
      public void testNegativeReadWithReadOnlyTransactionClosed()
          throws Throwable {
  
 -        final ActorRef shard =
 -            getSystem().actorOf(Shard.props(SHARD_IDENTIFIER, Collections.EMPTY_MAP, new DatastoreContext()));
 +        final ActorRef shard = createShard();
          final Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard,
-                 testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                 testSchemaContext, datastoreContext, shardStats);
  
          final TestActorRef<ShardTransaction> subject = TestActorRef
              .create(getSystem(), props,
@@@ -101,9 -101,10 +104,9 @@@
      public void testNegativeReadWithReadWriteTransactionClosed()
          throws Throwable {
  
 -        final ActorRef shard =
 -            getSystem().actorOf(Shard.props(SHARD_IDENTIFIER, Collections.EMPTY_MAP, new DatastoreContext()));
 +        final ActorRef shard = createShard();
          final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard,
-                 testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                 testSchemaContext, datastoreContext, shardStats);
  
          final TestActorRef<ShardTransaction> subject = TestActorRef
              .create(getSystem(), props,
@@@ -130,9 -131,10 +133,9 @@@
      public void testNegativeExistsWithReadWriteTransactionClosed()
          throws Throwable {
  
 -        final ActorRef shard =
 -            getSystem().actorOf(Shard.props(SHARD_IDENTIFIER, Collections.EMPTY_MAP, new DatastoreContext()));
 +        final ActorRef shard = createShard();
          final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard,
-                 testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                 testSchemaContext, datastoreContext, shardStats);
  
          final TestActorRef<ShardTransaction> subject = TestActorRef
              .create(getSystem(), props,
@@@ -159,9 -161,10 +162,9 @@@
      public void testNegativeWriteWithTransactionReady() throws Exception {
  
  
 -        final ActorRef shard =
 -            getSystem().actorOf(Shard.props(SHARD_IDENTIFIER, Collections.EMPTY_MAP, new DatastoreContext()));
 +        final ActorRef shard = createShard();
          final Props props = ShardTransaction.props(store.newWriteOnlyTransaction(), shard,
-                 testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                 testSchemaContext, datastoreContext, shardStats);
  
          final TestActorRef<ShardTransaction> subject = TestActorRef
              .create(getSystem(), props,
@@@ -191,9 -194,10 +194,9 @@@
      public void testNegativeReadWriteWithTransactionReady() throws Exception {
  
  
 -        final ActorRef shard =
 -            getSystem().actorOf(Shard.props(SHARD_IDENTIFIER, Collections.EMPTY_MAP, new DatastoreContext()));
 +        final ActorRef shard = createShard();
          final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard,
-                 testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                 testSchemaContext, datastoreContext, shardStats);
  
          final TestActorRef<ShardTransaction> subject = TestActorRef
              .create(getSystem(), props,
@@@ -228,9 -232,10 +231,9 @@@
      public void testNegativeMergeTransactionReady() throws Exception {
  
  
 -        final ActorRef shard =
 -            getSystem().actorOf(Shard.props(SHARD_IDENTIFIER, Collections.EMPTY_MAP, new DatastoreContext()));
 +        final ActorRef shard = createShard();
          final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard,
-                 testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                 testSchemaContext, datastoreContext, shardStats);
  
          final TestActorRef<ShardTransaction> subject = TestActorRef
              .create(getSystem(), props, "testNegativeMergeTransactionReady");
@@@ -260,9 -265,10 +263,9 @@@
      public void testNegativeDeleteDataWhenTransactionReady() throws Exception {
  
  
 -        final ActorRef shard =
 -            getSystem().actorOf(Shard.props(SHARD_IDENTIFIER, Collections.EMPTY_MAP, new DatastoreContext()));
 +        final ActorRef shard = createShard();
          final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard,
-                 testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                 testSchemaContext, datastoreContext, shardStats);
  
          final TestActorRef<ShardTransaction> subject = TestActorRef
              .create(getSystem(), props,

diff --cc opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
index c9e08f9,c779d7f..0beb00b
--- 1/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
--- 2/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
@@@ -75,9 -73,10 +78,9 @@@ public class ShardTransactionTest exten
      @Test
      public void testOnReceiveReadData() throws Exception {
          new JavaTestKit(getSystem()) {{
 -            final ActorRef shard = getSystem().actorOf(Shard.props(SHARD_IDENTIFIER,
 -                    Collections.EMPTY_MAP, new DatastoreContext()));
 +            final ActorRef shard = createShard();
              final Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard,
-                     testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                     testSchemaContext, datastoreContext, shardStats);
              final ActorRef subject = getSystem().actorOf(props, "testReadData");
  
              new Within(duration("1 seconds")) {
@@@ -117,9 -116,10 +120,9 @@@
      @Test
      public void testOnReceiveReadDataWhenDataNotFound() throws Exception {
          new JavaTestKit(getSystem()) {{
 -            final ActorRef shard = getSystem().actorOf(Shard.props(SHARD_IDENTIFIER,
 -                    Collections.EMPTY_MAP, new DatastoreContext()));
 +            final ActorRef shard = createShard();
              final Props props = ShardTransaction.props( store.newReadOnlyTransaction(), shard,
-                     testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                     testSchemaContext, datastoreContext, shardStats);
              final ActorRef subject = getSystem().actorOf(props, "testReadDataWhenDataNotFound");
  
              new Within(duration("1 seconds")) {
@@@ -160,9 -160,10 +163,9 @@@
      @Test
      public void testOnReceiveDataExistsPositive() throws Exception {
          new JavaTestKit(getSystem()) {{
 -            final ActorRef shard = getSystem().actorOf(Shard.props(SHARD_IDENTIFIER,
 -                    Collections.EMPTY_MAP, new DatastoreContext()));
 +            final ActorRef shard = createShard();
              final Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard,
-                     testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                     testSchemaContext, datastoreContext, shardStats);
              final ActorRef subject = getSystem().actorOf(props, "testDataExistsPositive");
  
              new Within(duration("1 seconds")) {
@@@ -202,9 -203,10 +205,9 @@@
      @Test
      public void testOnReceiveDataExistsNegative() throws Exception {
          new JavaTestKit(getSystem()) {{
 -            final ActorRef shard = getSystem().actorOf(Shard.props(SHARD_IDENTIFIER,
 -                    Collections.EMPTY_MAP, new DatastoreContext()));
 +            final ActorRef shard = createShard();
              final Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard,
-                     testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                     testSchemaContext, datastoreContext, shardStats);
              final ActorRef subject = getSystem().actorOf(props, "testDataExistsNegative");
  
              new Within(duration("1 seconds")) {
@@@ -279,9 -281,10 +282,9 @@@
      @Test
      public void testOnReceiveWriteData() throws Exception {
          new JavaTestKit(getSystem()) {{
 -            final ActorRef shard = getSystem().actorOf(Shard.props(SHARD_IDENTIFIER,
 -                    Collections.EMPTY_MAP, new DatastoreContext()));
 +            final ActorRef shard = createShard();
              final Props props = ShardTransaction.props(store.newWriteOnlyTransaction(), shard,
-                     testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                     testSchemaContext, datastoreContext, shardStats);
              final ActorRef subject =
                  getSystem().actorOf(props, "testWriteData");
  
@@@ -319,9 -322,10 +322,9 @@@
      @Test
      public void testOnReceiveMergeData() throws Exception {
          new JavaTestKit(getSystem()) {{
 -            final ActorRef shard = getSystem().actorOf(Shard.props(SHARD_IDENTIFIER,
 -                    Collections.EMPTY_MAP, new DatastoreContext()));
 +            final ActorRef shard = createShard();
              final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard,
-                     testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                     testSchemaContext, datastoreContext, shardStats);
              final ActorRef subject =
                  getSystem().actorOf(props, "testMergeData");
  
@@@ -360,9 -364,10 +363,9 @@@
      @Test
      public void testOnReceiveDeleteData() throws Exception {
          new JavaTestKit(getSystem()) {{
 -            final ActorRef shard = getSystem().actorOf(Shard.props(SHARD_IDENTIFIER,
 -                    Collections.EMPTY_MAP, new DatastoreContext()));
 +            final ActorRef shard = createShard();
              final Props props = ShardTransaction.props( store.newWriteOnlyTransaction(), shard,
-                     testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                     testSchemaContext, datastoreContext, shardStats);
              final ActorRef subject =
                  getSystem().actorOf(props, "testDeleteData");
  
@@@ -399,9 -404,10 +402,9 @@@
      @Test
      public void testOnReceiveReadyTransaction() throws Exception {
          new JavaTestKit(getSystem()) {{
 -            final ActorRef shard = getSystem().actorOf(Shard.props(SHARD_IDENTIFIER,
 -                    Collections.EMPTY_MAP, new DatastoreContext()));
 +            final ActorRef shard = createShard();
              final Props props = ShardTransaction.props( store.newReadWriteTransaction(), shard,
-                     testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                     testSchemaContext, datastoreContext, shardStats);
              final ActorRef subject =
                  getSystem().actorOf(props, "testReadyTransaction");
  
@@@ -437,9 -443,10 +440,9 @@@
      @Test
      public void testOnReceiveCloseTransaction() throws Exception {
          new JavaTestKit(getSystem()) {{
 -            final ActorRef shard = getSystem().actorOf(Shard.props(SHARD_IDENTIFIER,
 -                    Collections.EMPTY_MAP, new DatastoreContext()));
 +            final ActorRef shard = createShard();
              final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard,
-                     testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                     testSchemaContext, datastoreContext, shardStats);
              final ActorRef subject =
                  getSystem().actorOf(props, "testCloseTransaction");
  
@@@ -487,9 -494,10 +490,9 @@@
  
      @Test(expected=UnknownMessageException.class)
      public void testNegativePerformingWriteOperationOnReadTransaction() throws Exception {
 -        final ActorRef shard = getSystem().actorOf(Shard.props(SHARD_IDENTIFIER,
 -                Collections.EMPTY_MAP, new DatastoreContext()));
 +        final ActorRef shard = createShard();
          final Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard,
-                 testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                 testSchemaContext, datastoreContext, shardStats);
          final TestActorRef subject = TestActorRef.apply(props,getSystem());
  
          subject.receive(new DeleteData(TestModel.TEST_PATH).toSerializable(), ActorRef.noSender());
@@@ -498,13 -506,15 +501,14 @@@
      @Test
      public void testShardTransactionInactivity() {
  
-         datastoreContext = new DatastoreContext(InMemoryDOMDataStoreConfigProperties.getDefault(),
-                 Duration.create(500, TimeUnit.MILLISECONDS));
+         datastoreContext = new DatastoreContext("Test",
+                 InMemoryDOMDataStoreConfigProperties.getDefault(),
+                 Duration.create(500, TimeUnit.MILLISECONDS), 5);
  
          new JavaTestKit(getSystem()) {{
 -            final ActorRef shard = getSystem().actorOf(Shard.props(SHARD_IDENTIFIER,
 -                    Collections.EMPTY_MAP, new DatastoreContext()));
 +            final ActorRef shard = createShard();
              final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard,
-                     testSchemaContext, datastoreContext,SHARD_IDENTIFIER.toString());
+                     testSchemaContext, datastoreContext, shardStats);
              final ActorRef subject =
                  getSystem().actorOf(props, "testShardTransactionInactivity");
  

diff --cc opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortFailureTest.java
Simple merge