luxolus/open-consul
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Always increments the failovers counter, even for error-ed DCs.

Browse source
This commit is contained in:
James Phillips 2015-11-11 08:48:03 -08:00
parent 07361d3e96
commit 095806584d
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
consul/prepared_query_endpoint.go
View file

@ -535,11 +535,16 @@ func queryFailover(q queryServer, query *structs.PreparedQuery,
}
}
// Now try the selected DCs in priority order. Note that we pass along
// the limit since it can be applied remotely to save bandwidth. We also
// pass along the consistency mode information we were given, so that
// applies to the remote query as well.
for i, dc := range dcs {
// Now try the selected DCs in priority order.
failovers := 0
for _, dc := range dcs {
// This keeps track of how many iterations we actually run.
failovers++
// Note that we pass along the limit since it can be applied
// remotely to save bandwidth. We also pass along the consistency
// mode information we were given, so that applies to the remote
// query as well.
remote := &structs.PreparedQueryExecuteRemoteRequest{
Datacenter: dc,
Query: *query,
@ -551,14 +556,15 @@ func queryFailover(q queryServer, query *structs.PreparedQuery,
continue
}
// Keep track of the number of failovers.
reply.Failovers = i + 1
// We can stop if we found some nodes.
if len(reply.Nodes) > 0 {
break
}
}
// Set this at the end because the response from the remote doesn't have
// this information.
reply.Failovers = failovers
return nil
}