From 5b1b23740a2ba1c768b03ceacb18f13df432b97a Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Wed, 10 Feb 2016 19:02:25 -0800
Subject: [PATCH] Update integration cluster templates

This is a short term fix.
The right thing to do is to use distribution packaged templates.

Change-Id: Iecaf7395b9a888543a1b6679f6a0498af7dc50ad
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 .../multi-node-test/akka.conf.template        | 62 +++++++------------
 1 file changed, 23 insertions(+), 39 deletions(-)

diff --git a/tools/clustering/cluster-deployer/templates/multi-node-test/akka.conf.template b/tools/clustering/cluster-deployer/templates/multi-node-test/akka.conf.template
index 94e1ae27db..942bb8eb2c 100644
--- a/tools/clustering/cluster-deployer/templates/multi-node-test/akka.conf.template
+++ b/tools/clustering/cluster-deployer/templates/multi-node-test/akka.conf.template
@@ -11,19 +11,20 @@ odl-cluster-data {
   akka {
     loglevel = "INFO"
     loggers = ["akka.event.slf4j.Slf4jLogger"]
+    logger-startup-timeout = 300s
 
     actor {
-
       provider = "akka.cluster.ClusterActorRefProvider"
       serializers {
-                java = "akka.serialization.JavaSerializer"
-                proto = "akka.remote.serialization.ProtobufSerializer"
-              }
-
-              serialization-bindings {
-                  "com.google.protobuf.Message" = proto
+        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
+      }
 
       default-dispatcher {
         # Setting throughput to 1 makes the dispatcher fair. It processes 1 message from
@@ -50,6 +51,8 @@ odl-cluster-data {
 
     cluster {
       seed-nodes = {{{DS_SEED_NODES}}}
+      
+      seed-node-timeout = 12s
 
       auto-down-unreachable-after = 30s
 
@@ -58,42 +61,23 @@ odl-cluster-data {
       ]
 
     }
-  }
-}
 
-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"]
-    log-dead-letters = 10000
+      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 = "{{HOST}}"
-        port = 2551
-        maximum-frame-size = 419430400
-        send-buffer-size = 52428800
-        receive-buffer-size = 52428800
+          # native = off
+        }
       }
     }
-
-    cluster {
-      seed-nodes = {{{RPC_SEED_NODES}}}
-
-      auto-down-unreachable-after = 30s
-    }
   }
 }
-- 
2.36.6