X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fresources%2Fapplication.conf;h=5e61f4defca9727417cc186a940fda4ea0f18fdf;hp=a68a0a80d1a56748156f23fe1fa1a8c07eac3e40;hb=51bf6c7493843ad23f074930b56925162732a8b2;hpb=c09801280b4c44f4ec26766e4d13b1a5d1f3ed59

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/application.conf b/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/application.conf
index a68a0a80d1..5e61f4defc 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/application.conf
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/resources/application.conf
@@ -5,16 +5,6 @@ akka {
     loggers = ["akka.testkit.TestEventListener", "akka.event.slf4j.Slf4jLogger"]
 
     actor {
-         serializers {
-                  java = "akka.serialization.JavaSerializer"
-                  proto = "akka.remote.serialization.ProtobufSerializer"
-         }
-
-        serialization-bindings {
-            "org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification" = java
-            "com.google.protobuf.Message" = proto
-
-        }
     }
 }
 
@@ -51,6 +41,12 @@ test {
     plugin-dispatcher = "akka.persistence.dispatchers.default-plugin-dispatcher"
   }
 
+  shard-dispatcher {
+    type = Dispatcher
+    executor = "default-executor"
+    mailbox-type = "org.opendaylight.controller.cluster.common.actor.UnboundedDequeBasedControlAwareMailbox"
+  }
+
   akka {
     persistence.snapshot-store.plugin = "in-memory-snapshot-store"
     persistence.journal.plugin = "in-memory-journal"
@@ -61,13 +57,10 @@ test {
       provider = "akka.cluster.ClusterActorRefProvider"
 
       serializers {
-          java = "akka.serialization.JavaSerializer"
-          proto = "akka.remote.serialization.ProtobufSerializer"
           readylocal = "org.opendaylight.controller.cluster.datastore.messages.ReadyLocalTransactionSerializer"
       }
 
       serialization-bindings {
-          "com.google.protobuf.Message" = proto
           "org.opendaylight.controller.cluster.datastore.messages.ReadyLocalTransaction" = readylocal
       }
     }
@@ -112,6 +105,12 @@ Member1 {
     plugin-dispatcher = "akka.persistence.dispatchers.default-plugin-dispatcher"
   }
 
+  shard-dispatcher {
+    type = Dispatcher
+    executor = "default-executor"
+    mailbox-type = "org.opendaylight.controller.cluster.common.actor.UnboundedDequeBasedControlAwareMailbox"
+  }
+
   akka {
     persistence.snapshot-store.plugin = "in-memory-snapshot-store"
     persistence.journal.plugin = "in-memory-journal"
@@ -122,13 +121,10 @@ Member1 {
       provider = "akka.cluster.ClusterActorRefProvider"
 
       serializers {
-          java = "akka.serialization.JavaSerializer"
-          proto = "akka.remote.serialization.ProtobufSerializer"
           readylocal = "org.opendaylight.controller.cluster.datastore.messages.ReadyLocalTransactionSerializer"
       }
 
       serialization-bindings {
-          "com.google.protobuf.Message" = proto
           "org.opendaylight.controller.cluster.datastore.messages.ReadyLocalTransaction" = readylocal
       }
     }
@@ -172,6 +168,12 @@ Member2 {
     plugin-dispatcher = "akka.persistence.dispatchers.default-plugin-dispatcher"
   }
 
+  shard-dispatcher {
+    type = Dispatcher
+    executor = "default-executor"
+    mailbox-type = "org.opendaylight.controller.cluster.common.actor.UnboundedDequeBasedControlAwareMailbox"
+  }
+
   akka {
     persistence.snapshot-store.plugin = "in-memory-snapshot-store"
     persistence.journal.plugin = "in-memory-journal"
@@ -180,13 +182,10 @@ Member2 {
       provider = "akka.cluster.ClusterActorRefProvider"
 
       serializers {
-          java = "akka.serialization.JavaSerializer"
-          proto = "akka.remote.serialization.ProtobufSerializer"
           readylocal = "org.opendaylight.controller.cluster.datastore.messages.ReadyLocalTransactionSerializer"
       }
 
       serialization-bindings {
-          "com.google.protobuf.Message" = proto
           "org.opendaylight.controller.cluster.datastore.messages.ReadyLocalTransaction" = readylocal
       }
     }
@@ -230,6 +229,12 @@ Member3 {
     plugin-dispatcher = "akka.persistence.dispatchers.default-plugin-dispatcher"
   }
 
+  shard-dispatcher {
+    type = Dispatcher
+    executor = "default-executor"
+    mailbox-type = "org.opendaylight.controller.cluster.common.actor.UnboundedDequeBasedControlAwareMailbox"
+  }
+
   akka {
     persistence.snapshot-store.plugin = "in-memory-snapshot-store"
     persistence.journal.plugin = "in-memory-journal"
@@ -240,13 +245,10 @@ Member3 {
       provider = "akka.cluster.ClusterActorRefProvider"
 
       serializers {
-          java = "akka.serialization.JavaSerializer"
-          proto = "akka.remote.serialization.ProtobufSerializer"
           readylocal = "org.opendaylight.controller.cluster.datastore.messages.ReadyLocalTransactionSerializer"
       }
 
       serialization-bindings {
-          "com.google.protobuf.Message" = proto
           "org.opendaylight.controller.cluster.datastore.messages.ReadyLocalTransaction" = readylocal
       }
     }
@@ -290,6 +292,12 @@ Member4 {
     plugin-dispatcher = "akka.persistence.dispatchers.default-plugin-dispatcher"
   }
 
+  shard-dispatcher {
+    type = Dispatcher
+    executor = "default-executor"
+    mailbox-type = "org.opendaylight.controller.cluster.common.actor.UnboundedDequeBasedControlAwareMailbox"
+  }
+
   akka {
     persistence.snapshot-store.plugin = "in-memory-snapshot-store"
     persistence.journal.plugin = "in-memory-journal"
@@ -300,13 +308,10 @@ Member4 {
       provider = "akka.cluster.ClusterActorRefProvider"
 
       serializers {
-          java = "akka.serialization.JavaSerializer"
-          proto = "akka.remote.serialization.ProtobufSerializer"
           readylocal = "org.opendaylight.controller.cluster.datastore.messages.ReadyLocalTransactionSerializer"
       }
 
       serialization-bindings {
-          "com.google.protobuf.Message" = proto
           "org.opendaylight.controller.cluster.datastore.messages.ReadyLocalTransaction" = readylocal
       }
     }
@@ -350,6 +355,12 @@ Member5 {
     plugin-dispatcher = "akka.persistence.dispatchers.default-plugin-dispatcher"
   }
 
+  shard-dispatcher {
+    type = Dispatcher
+    executor = "default-executor"
+    mailbox-type = "org.opendaylight.controller.cluster.common.actor.UnboundedDequeBasedControlAwareMailbox"
+  }
+
   akka {
     persistence.snapshot-store.plugin = "in-memory-snapshot-store"
     persistence.journal.plugin = "in-memory-journal"
@@ -360,13 +371,10 @@ Member5 {
       provider = "akka.cluster.ClusterActorRefProvider"
 
       serializers {
-          java = "akka.serialization.JavaSerializer"
-          proto = "akka.remote.serialization.ProtobufSerializer"
           readylocal = "org.opendaylight.controller.cluster.datastore.messages.ReadyLocalTransactionSerializer"
       }
 
       serialization-bindings {
-          "com.google.protobuf.Message" = proto
           "org.opendaylight.controller.cluster.datastore.messages.ReadyLocalTransaction" = readylocal
       }
     }