Merge pull request #2549 from influxdb/5_second_timeout

Default Raft election timeout to 5 seconds
influxdata · May 12, 2015 · 557b311 · 557b311
2 parents cb4d906 + f063ebf
commit 557b311
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ This release has a breaking API change for writes -- the field previously called
 - [#2525](https://github.com/influxdb/influxdb/pull/2525): Serve broker diagnostics over HTTP
 - [#2186](https://github.com/influxdb/influxdb/pull/2186): The default status code for queries is now `200 OK`
 - [#2298](https://github.com/influxdb/influxdb/pull/2298): Successful writes now return a status code of `204 No Content` - thanks @neonstalwart!
+- [#2549](https://github.com/influxdb/influxdb/pull/2549): Raft election timeout to 5 seconds, so system is more forgiving of CPU loads.
 
 ### Bugfixes
 - [#2535](https://github.com/influxdb/influxdb/pull/2535): Return exit status 0 if influxd already running. Thanks @haim0n.

diff --git a/etc/config.sample.toml b/etc/config.sample.toml
@@ -83,7 +83,7 @@ max-segment-size = 10485760
 # Raft configuration. Controls the distributed consensus system.
 [raft]
 apply-interval = "10ms"
-election-timeout = "1s"
+election-timeout = "5s"
 heartbeat-interval = "100ms"
 reconnect-timeout = "10ms"
 

diff --git a/raft/clock.go b/raft/clock.go
@@ -10,7 +10,7 @@ const (
 	DefaultApplyInterval = 10 * time.Millisecond
 
 	// DefaultElectionTimeout is the default time before starting an election.
-	DefaultElectionTimeout = 1 * time.Second
+	DefaultElectionTimeout = 5 * time.Second
 
 	// DefaultHeartbeatInterval is the default time to wait between heartbeats.
 	DefaultHeartbeatInterval = 100 * time.Millisecond