commit 1a4eca04592ffb56bf81110e24e13635c5a84a08
author Madan Jampani <madan@onlab.us> Thu Apr 02 15:29:26 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Apr 02 23:59:42 2015 +0000
tree a740a75ec305daf57d0afce5ee933b0ad6ab6ec8
parent 864cdd6a48af2a3a951d992307b0f9a82e70fc0c

Use a low raft leader election timeout when cluster size is one

Change-Id: I0755411f0b20b8e4cd8f8f2fa58e173add4f32dc

core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
index f0ff5c2..010276a 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
@@ -85,8 +85,7 @@
     public static final String BASE_PARTITION_NAME = "p0";
 
     private static final int DATABASE_STARTUP_TIMEOUT_SEC = 60;
-    private static final int RAFT_ELECTION_TIMEOUT = 3000;
-    private static final int RAFT_HEARTBEAT_TIMEOUT = 1500;
+    private static final int RAFT_ELECTION_TIMEOUT_MILLIS = 3000;
     private static final int DATABASE_OPERATION_TIMEOUT_MILLIS = 5000;
 
     private ClusterCoordinator coordinator;
@@ -132,8 +131,8 @@
 
         ClusterConfig clusterConfig = new ClusterConfig()
             .withProtocol(newNettyProtocol())
-            .withElectionTimeout(RAFT_ELECTION_TIMEOUT)
-            .withHeartbeatInterval(RAFT_HEARTBEAT_TIMEOUT)
+            .withElectionTimeout(electionTimeoutMillis(activeNodeUris))
+            .withHeartbeatInterval(heartbeatTimeoutMillis(activeNodeUris))
             .withMembers(activeNodeUris)
             .withLocalMember(localNodeUri);
 
@@ -264,14 +263,22 @@
     private DatabaseConfig newDatabaseConfig(String name, Log log, String[] replicas) {
         return new DatabaseConfig()
             .withName(name)
-            .withElectionTimeout(RAFT_ELECTION_TIMEOUT)
-            .withHeartbeatInterval(RAFT_HEARTBEAT_TIMEOUT)
+            .withElectionTimeout(electionTimeoutMillis(replicas))
+            .withHeartbeatInterval(heartbeatTimeoutMillis(replicas))
             .withConsistency(Consistency.STRONG)
             .withLog(log)
             .withDefaultSerializer(new DatabaseSerializer())
             .withReplicas(replicas);
     }
 
+    private long electionTimeoutMillis(String[] replicas) {
+        return replicas.length == 1 ? 10L : RAFT_ELECTION_TIMEOUT_MILLIS;
+    }
+
+    private long heartbeatTimeoutMillis(String[] replicas) {
+        return electionTimeoutMillis(replicas) / 2;
+    }
+
     /**
      * Maps a Raft Database object to a PartitionInfo object.
      *