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

Update error handling

pull/8411/head
freddygv 2020-08-10 17:48:22 -06:00
parent c8f5215e9d
commit de0b574a26
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/consul/state/catalog.go
View File

@ -2189,6 +2189,9 @@ func (s *Store) GatewayServices(ws memdb.WatchSet, gateway string, entMeta *stru
ws.Add(iter.WatchCh()) ws.Add(iter.WatchCh())
maxIdx, results, err := s.collectGatewayServices(tx, ws, iter) maxIdx, results, err := s.collectGatewayServices(tx, ws, iter)
if err != nil {
return 0, nil, err
}
idx := maxIndexTxn(tx, gatewayServicesTableName) idx := maxIndexTxn(tx, gatewayServicesTableName)
return lib.MaxUint64(maxIdx, idx), results, nil return lib.MaxUint64(maxIdx, idx), results, nil
@ -2707,6 +2710,9 @@ func (s *Store) DumpGatewayServices(ws memdb.WatchSet) (uint64, structs.GatewayS
ws.Add(iter.WatchCh()) ws.Add(iter.WatchCh())
maxIdx, results, err := s.collectGatewayServices(tx, ws, iter) maxIdx, results, err := s.collectGatewayServices(tx, ws, iter)
if err != nil {
return 0, nil, err
}
idx := maxIndexTxn(tx, gatewayServicesTableName) idx := maxIndexTxn(tx, gatewayServicesTableName)
return lib.MaxUint64(maxIdx, idx), results, nil return lib.MaxUint64(maxIdx, idx), results, nil