Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

rafthttp: handle short case in if statement

Browse Source
This commit is contained in:
Xiang Li 2016-02-16 19:26:01 -08:00
parent d393102e24
commit 74382f56fb
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rafthttp/stream.go
View File

@ -143,29 +143,33 @@ func (cw *streamWriter) run() {
select { select {
case <-heartbeatc: case <-heartbeatc:
start := time.Now() start := time.Now()
if err := enc.encode(linkHeartbeatMessage); err != nil { err := enc.encode(linkHeartbeatMessage)
reportSentFailure(string(t), linkHeartbeatMessage) if err == nil {
flusher.Flush()
reportSentDuration(string(t), linkHeartbeatMessage, time.Since(start))
continue
}
reportSentFailure(string(t), linkHeartbeatMessage)
cw.status.deactivate(failureType{source: t.String(), action: "heartbeat"}, err.Error()) cw.status.deactivate(failureType{source: t.String(), action: "heartbeat"}, err.Error())
cw.close() cw.close()
heartbeatc, msgc = nil, nil heartbeatc, msgc = nil, nil
continue
}
flusher.Flush()
reportSentDuration(string(t), linkHeartbeatMessage, time.Since(start))
case m := <-msgc: case m := <-msgc:
start := time.Now() start := time.Now()
if err := enc.encode(m); err != nil { err := enc.encode(m)
reportSentFailure(string(t), m) if err == nil {
flusher.Flush()
reportSentDuration(string(t), m, time.Since(start))
continue
}
reportSentFailure(string(t), m)
cw.status.deactivate(failureType{source: t.String(), action: "write"}, err.Error()) cw.status.deactivate(failureType{source: t.String(), action: "write"}, err.Error())
cw.close() cw.close()
heartbeatc, msgc = nil, nil heartbeatc, msgc = nil, nil
cw.r.ReportUnreachable(m.To) cw.r.ReportUnreachable(m.To)
continue
}
flusher.Flush()
reportSentDuration(string(t), m, time.Since(start))
case conn := <-cw.connc: case conn := <-cw.connc:
cw.close() cw.close()
t = conn.t t = conn.t