Bug 7518: Temporarily revert the main akka.conf to netty

[controller.git] / opendaylight / md-sal / sal-clustering-config / src / main / resources / initial / akka.conf

diff --git a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/akka.conf b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/akka.conf
index e72f4b2675eb886226ad660204fe706513937094..9977babe350fa503bba0356c74eb109fccadb172 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/akka.conf
+++ b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/akka.conf
@@ -1,96 +1,44 @@
 
 odl-cluster-data {
-  bounded-mailbox {
-    mailbox-type = "org.opendaylight.controller.cluster.common.actor.MeteredBoundedMailbox"
-    mailbox-capacity = 1000
-    mailbox-push-timeout-time = 100ms
-  }
-
-  metric-capture-enabled = true
-
   akka {
-    loglevel = "INFO"
-    loggers = ["akka.event.slf4j.Slf4jLogger"]
-
-    actor {
-      provider = "akka.cluster.ClusterActorRefProvider"
-      serializers {
-        java = "akka.serialization.JavaSerializer"
-        proto = "akka.remote.serialization.ProtobufSerializer"
-      }
-
-      serialization-bindings {
-        "com.google.protobuf.Message" = proto
-      }
-
-      default-dispatcher {
-        # Setting throughput to 1 makes the dispatcher fair. It processes 1 message from
-        # the mailbox before moving on to the next mailbox
-        throughput = 1
-      }
-
-      default-mailbox {
-        # When not using a BalancingDispatcher it is recommended that we use the SingleConsumerOnlyUnboundedMailbox
-        # as it is the most efficient for multiple producer/single consumer use cases
-        mailbox-type="akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
-      }
-    }
     remote {
-      log-remote-lifecycle-events = off
+      artery {
+        enabled = off
+        canonical.hostname = "127.0.0.1"
+        canonical.port = 2550
+      }
       netty.tcp {
         hostname = "127.0.0.1"
         port = 2550
-        maximum-frame-size = 419430400
-        send-buffer-size = 52428800
-        receive-buffer-size = 52428800
       }
     }
 
     cluster {
+      # Remove ".tcp" when using artery.
       seed-nodes = ["akka.tcp://opendaylight-cluster-data@127.0.0.1:2550"]
 
-      auto-down-unreachable-after = 300s
-
       roles = [
         "member-1"
       ]
 
     }
-  }
-}
 
-odl-cluster-rpc {
-  bounded-mailbox {
-    mailbox-type = "org.opendaylight.controller.cluster.common.actor.MeteredBoundedMailbox"
-    mailbox-capacity = 1000
-    mailbox-push-timeout-time = 100ms
-  }
+    persistence {
+      # By default the snapshots/journal directories live in KARAF_HOME. You can choose to put it somewhere else by
+      # modifying the following two properties. The directory location specified may be a relative or absolute path. 
+      # The relative path is always relative to KARAF_HOME.
 
-  metric-capture-enabled = true
+      # snapshot-store.local.dir = "target/snapshots"
+      # journal.leveldb.dir = "target/journal"
 
-  akka {
-    loglevel = "INFO"
-    loggers = ["akka.event.slf4j.Slf4jLogger"]
+      journal {
+        leveldb {
+          # Set native = off to use a Java-only implementation of leveldb.
+          # Note that the Java-only version is not currently considered by Akka to be production quality.
 
-    actor {
-      provider = "akka.cluster.ClusterActorRefProvider"
-
-    }
-    remote {
-      log-remote-lifecycle-events = off
-      netty.tcp {
-        hostname = "127.0.0.1"
-        port = 2551
-        maximum-frame-size = 419430400
-        send-buffer-size = 52428800
-        receive-buffer-size = 52428800
+          # native = off
+        }
       }
     }
-
-    cluster {
-      seed-nodes = ["akka.tcp://odl-cluster-rpc@127.0.0.1:2551"]
-
-      auto-down-unreachable-after = 300s
-    }
   }
 }