Merge pull request #2915 from influxdb/wait_for_leader

Wait for Raft leader even when cluster exists

cmd/influxd/run/server.go

@@ -336,13 +336,6 @@ func (s *Server) Close() error {
 // startServerReporting starts periodic server reporting.
 func (s *Server) startServerReporting() {
 	for {
-		for {
-			time.Sleep(time.Second)
-			if s.MetaStore.Leader() != "" {
-				break
-			}
-		}
-
 		s.reportServer()
 		<-time.After(24 * time.Hour)
 	}

meta/store.go

@@ -186,6 +186,7 @@ func (s *Store) Open() error {
 	if s.id == 0 {
 		go s.init()
 	} else {
+		s.waitForLeader(10 * time.Second)
 		close(s.ready)
 	}