github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix roots race with CA setup hammering bug and defensive nil check hit during obscure upgrade scenario

pull/4275/head
Paul Banks 2018-06-08 22:27:05 +01:00 committed by Jack Pearkes
parent 4b7ca952d6
commit 41a29a469e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agent/http.go
View File

@ -417,6 +417,14 @@ func setTranslateAddr(resp http.ResponseWriter, active bool) {
// setIndex is used to set the index response header // setIndex is used to set the index response header
func setIndex(resp http.ResponseWriter, index uint64) { func setIndex(resp http.ResponseWriter, index uint64) {
// If we ever return X-Consul-Index of 0 blocking clients will go into a busy
// loop and hammer us since ?index=0 will never block. It's always safe to
// return index=1 since the very first Raft write is always an internal one
// writing the raft config for the cluster so no user-facing blocking query
// will ever legitimately have an X-Consul-Index of 1.
if index == 0 {
index = 1
}
resp.Header().Set("X-Consul-Index", strconv.FormatUint(index, 10)) resp.Header().Set("X-Consul-Index", strconv.FormatUint(index, 10))
} }

2
connect/resolver.go
View File

@ -172,7 +172,7 @@ func (cr *ConsulResolver) resolveServiceEntry(entry *api.ServiceEntry) (string,
port := entry.Service.Port port := entry.Service.Port
service := entry.Service.Service service := entry.Service.Service
if !entry.Service.Connect.Native { if entry.Service.Connect != nil && !entry.Service.Connect.Native {
service = entry.Service.ProxyDestination service = entry.Service.ProxyDestination
} }