From: Moiz Raja <moraja@cisco.com>
Date: Fri, 27 Feb 2015 03:26:20 +0000 (-0800)
Subject: BUG 2768 : Make election timeout factor 20 by default
X-Git-Tag: release/lithium~458
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=86a7d641b5cb22874f558f798adbb451fd5ced00;hp=a8469dc0d7cacf28a09c24074bd48f380a2b8409

BUG 2768 : Make election timeout factor 20 by default

We may need a follow up patch to make shards in a single node cluster
Leader by default.

For now this fix will delay Shard startup by 10 seconds in a single node cluster.

Change-Id: I5524c622f6eaeba2739d4cfe574f4ead759b8e10
Signed-off-by: Moiz Raja <moraja@cisco.com>
---

diff --git a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/05-clustering.xml.conf b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/05-clustering.xml.conf
index 96ed7f1838..df6091b015 100644
--- a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/05-clustering.xml.conf
+++ b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/05-clustering.xml.conf
@@ -40,6 +40,7 @@
                     </operational-schema-service>
                     <operational-properties>
                         <persistent>false</persistent>
+                        <shard-election-timeout-factor>20</shard-election-timeout-factor>
                     </operational-properties>
                 </module>
 
@@ -50,6 +51,9 @@
                         <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
                         <name>yang-schema-service</name>
                     </config-schema-service>
+                    <config-properties>
+                        <shard-election-timeout-factor>20</shard-election-timeout-factor>
+                    </config-properties>
                 </module>
 
                 <module>
diff --git a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/datastore.cfg b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/datastore.cfg
index 8e03223a71..7df398355e 100644
--- a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/datastore.cfg
+++ b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/datastore.cfg
@@ -7,7 +7,7 @@
 
 # The multiplication factor to be used to determine shard election timeout. The shard election timeout
 # is determined by multiplying shardHeartbeatIntervalInMillis with the shardElectionTimeoutFactor.
-#shard-election-timeout-factor=2
+shard-election-timeout-factor=20
 
 # The interval at which a shard will send a heart beat message to its remote shard.
 #shard-heartbeat-interval-in-millis=500