Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix restore functionality hangs forever

pull/4918/head
oiooj 2015-11-26 23:14:09 +08:00
parent 3b035ccaea
commit f14482040e
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meta/store.go
View File

@ -16,7 +16,6 @@ import (
"path/filepath"
"sort"
"strconv"
"strings"
"sync"
"time"
@ -735,12 +734,12 @@ func (s *Store) serveExecListener() {
// Accept next TCP connection.
var err error
conn, err := s.ExecListener.Accept()
if err != nil {
if strings.Contains(err.Error(), "connection closed") {
return
}
s.Logger.Printf("temporary accept error: %s", err)
if opErr, ok := err.(*net.OpError); ok && opErr.Temporary() {
s.Logger.Printf("exec listener temporary accept error: %s", err)
continue
} else if err != nil {
s.Logger.Printf("exec listener accept error and closed: %s", err)
return
}
// Handle connection in a separate goroutine.
@ -845,13 +844,12 @@ func (s *Store) serveRPCListener() {
for {
// Accept next TCP connection.
conn, err := s.RPCListener.Accept()
if err != nil {
if strings.Contains(err.Error(), "connection closed") {
return
}
s.Logger.Printf("temporary accept error: %s", err)
if opErr, ok := err.(*net.OpError); ok && opErr.Temporary() {
s.Logger.Printf("RPC listener temporary accept error: %s", err)
continue
} else if err != nil {
s.Logger.Printf("RPC listener accept error and closed: %s", err)
return
}
// Handle connection in a separate goroutine.