Merge pull request #1875 from influxdb/raft_log_trace

Support control of Raft debug logging

CHANGELOG.md

@@ -8,6 +8,9 @@
 - [#1862](https://github.com/influxdb/influxdb/pull/1862): Fix memory leak in `httpd.serveWait`. Thanks @mountkin
 - [#1868](https://github.com/influxdb/influxdb/pull/1868): Use `BatchPoints` for `client.Write` method. Thanks @vladlopes, @georgmu, @d2g, @evanphx, @akolosov.
 
+### Features
+- [#1875](https://github.com/influxdb/influxdb/pull/1875): Support trace logging of Raft.
+
 ## v0.9.0-rc9 [2015-03-06]
 
 ### Bugfixes

cmd/influxd/config.go

@@ -96,8 +96,9 @@ type Config struct {
 	} `toml:"cluster"`
 
 	Logging struct {
-		File              string `toml:"file"`
-		WriteTraceEnabled bool   `toml:"write-tracing"`
+		File         string `toml:"file"`
+		WriteTracing bool   `toml:"write-tracing"`
+		RaftTracing  bool   `toml:"raft-tracing"`
 	} `toml:"logging"`
 
 	ContinuousQuery struct {

cmd/influxd/config_test.go

@@ -175,6 +175,7 @@ enabled = true
 [logging]
 file   = "influxdb.log"
 write-tracing = true
+raft-tracing = true
 
 # Configure the admin server
 [admin]

cmd/influxd/run.go

@@ -53,6 +53,9 @@ func Run(config *Config, join, version string, logWriter *os.File) (*messaging.B
 	// Open broker, initialize or join as necessary.
 	b := openBroker(config.BrokerDir(), config.BrokerURL(), initBroker, joinURLs, logWriter)
 
+	// Configure debug of Raft module.
+	b.EnableRaftDebug(config.Logging.RaftTracing)
+
 	// Start the broker handler.
 	var h *Handler
 	if b != nil {
@@ -90,7 +93,7 @@ func Run(config *Config, join, version string, logWriter *os.File) (*messaging.B
 	if s != nil {
 		sh := httpd.NewHandler(s, config.Authentication.Enabled, version)
 		sh.SetLogOutput(logWriter)
-		sh.WriteTrace = config.Logging.WriteTraceEnabled
+		sh.WriteTrace = config.Logging.WriteTracing
 
 		if h != nil && config.BrokerAddr() == config.DataAddr() {
 			h.serverHandler = sh
@@ -267,7 +270,7 @@ func openServer(config *Config, b *influxdb.Broker, initServer, initBroker, conf
 	// Create and open the server.
 	s := influxdb.NewServer()
 	s.SetLogOutput(w)
-	s.WriteTrace = config.Logging.WriteTraceEnabled
+	s.WriteTrace = config.Logging.WriteTracing
 	s.RecomputePreviousN = config.ContinuousQuery.RecomputePreviousN
 	s.RecomputeNoOlderThan = time.Duration(config.ContinuousQuery.RecomputeNoOlderThan)
 	s.ComputeRunsPerInterval = config.ContinuousQuery.ComputeRunsPerInterval

etc/config.sample.toml

@@ -84,3 +84,4 @@ dir = "/tmp/influxdb/development/state"
 [logging]
 file   = "/var/log/influxdb/influxd.log" # Leave blank to redirect logs to stderr.
 write-tracing = false # If true, enables detailed logging of the write system.
+raft-tracing = false # If true, enables detailed logging of Raft consensus.

messaging/broker.go

@@ -75,6 +75,11 @@ func (b *Broker) SetLogOutput(w io.Writer) {
 	b.log.SetLogOutput(w)
 }
 
+// EnableRaftDebug controls debugging functionality in the Raft concensus module.
+func (b *Broker) EnableRaftDebug(enable bool) {
+	b.log.DebugEnabled = enable
+}
+
 // Open initializes the log.
 // The broker then must be initialized or join a cluster before it can be used.
 func (b *Broker) Open(path string, u *url.URL) error {