X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-clustering-config%2Fsrc%2Fmain%2Fresources%2Finitial%2Ffactory-akka.conf;h=464645b6ae3aef4f041e97fe83edcd0028739943;hb=6321ac3879f1491c192287c8486db7e524257a41;hp=af200deedc0667baa06a1f1335a20605938b18bb;hpb=b47ffc2df37ef67559274068d651c86aa666cbc3;p=controller.git

diff --git a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/factory-akka.conf b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/factory-akka.conf
index af200deedc..464645b6ae 100644
--- a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/factory-akka.conf
+++ b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/factory-akka.conf
@@ -28,6 +28,29 @@ odl-cluster-data {
     throughput = 1
   }
 
+  serialization-dispatcher {
+    type = Dispatcher
+    executor = "fork-join-executor"
+    fork-join-executor {
+      # Min number of threads to cap factor-based parallelism number to
+      parallelism-min = 2
+      # Parallelism (threads) ... ceil(available processors * factor)
+      parallelism-factor = 2.0
+      # Max number of threads to cap factor-based parallelism number to
+      parallelism-max = 15
+    }
+    throughput = 1
+  }
+
+  shard-dispatcher {
+    type = Dispatcher
+    executor = "default-executor"
+
+    # We use a ControlAwareMailbox so that raft messages that implement ControlMessage
+    # are given higher priority.
+    mailbox-type = "org.opendaylight.controller.cluster.common.actor.UnboundedDequeBasedControlAwareMailbox"
+  }
+
   akka {
     loglevel = "INFO"
     loggers = ["akka.event.slf4j.Slf4jLogger"]
@@ -40,11 +63,13 @@ odl-cluster-data {
         java = "akka.serialization.JavaSerializer"
         proto = "akka.remote.serialization.ProtobufSerializer"
         readylocal = "org.opendaylight.controller.cluster.datastore.messages.ReadyLocalTransactionSerializer"
+        simpleReplicatedLogEntry = "org.opendaylight.controller.cluster.raft.persisted.SimpleReplicatedLogEntrySerializer"
       }
 
       serialization-bindings {
         "com.google.protobuf.Message" = proto
         "org.opendaylight.controller.cluster.datastore.messages.ReadyLocalTransaction" = readylocal
+        "org.opendaylight.controller.cluster.raft.persisted.SimpleReplicatedLogEntry" = simpleReplicatedLogEntry
       }
 
       default-dispatcher {
@@ -61,6 +86,9 @@ odl-cluster-data {
     }
     remote {
       log-remote-lifecycle-events = off
+      # Disable passive connections, as we are seeing issues
+      # with read-only associations
+      use-passive-connections = off
 
       netty.tcp {
         maximum-frame-size = 419430400
@@ -70,29 +98,70 @@ odl-cluster-data {
 
       artery {
         advanced {
-          maximum-frame-size = 1 GiB
-          maximum-large-frame-size = 1 GiB
+          #maximum-frame-size = 256 KiB
+          #maximum-large-frame-size = 2 MiB
         }
       }
     }
 
     cluster {
       seed-node-timeout = 12s
- 
+
       # Following is an excerpt from Akka Cluster Documentation
       # link - http://doc.akka.io/docs/akka/snapshot/java/cluster-usage.html
       # Warning - Akka recommends against using the auto-down feature of Akka Cluster in production.
-      # This is crucial for correct behavior if you use Cluster Singleton or Cluster Sharding, 
+      # This is crucial for correct behavior if you use Cluster Singleton or Cluster Sharding,
       # especially together with Akka Persistence.
 
       #auto-down-unreachable-after = 30s
 
       allow-weakly-up-members = on
+
+      use-dispatcher = cluster-dispatcher
+
+      failure-detector.acceptable-heartbeat-pause = 3 s
     }
 
     persistence {
-      journal.plugin = akka.persistence.journal.leveldb
+      journal {
+        # This would activate the deprecated levedb persistence plugin. This plugin was used
+        # by default by all OpenDaylight versions, but is considered not ready for production
+        # use by Akka. Magnesium defaults to segmented-file journal (below) and this option will
+        # be removed in a future release.
+        #
+        # plugin = akka.persistence.journal.leveldb
+
+        # The following activates the default segmented file journal. Each persistent actor
+        # is stored in a separate directory, with multiple segment files. Segments are removed
+        # when they are not longer required.
+        #
+        plugin = akka.persistence.journal.segmented-file
+
+        segmented-file {
+          class = "org.opendaylight.controller.akka.segjournal.SegmentedFileJournal"
+          # Root directory for segmented journal storage
+          root-directory = "segmented-journal"
+          # Maximum size of a single entry in the segmented journal
+          max-entry-size = 16M
+          # Maximum size of a segment
+          max-segment-size = 128M
+          # Map each segment into memory. Note that while this can improve performance,
+          # it will also place additional burden on system resources.
+          memory-mapped = false
+        }
+      }
+
+      snapshot-store.local.class = "org.opendaylight.controller.cluster.persistence.LocalSnapshotStore"
       snapshot-store.plugin = akka.persistence.snapshot-store.local
     }
   }
+
+  cluster-dispatcher {
+    type = "Dispatcher"
+    executor = "fork-join-executor"
+    fork-join-executor {
+      parallelism-min = 2
+      parallelism-max = 4
+    }
+  }
 }