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

Merge pull request #1413 from hashicorp/b-coord-raft-errors 

Adds a check for in-band error returns in the coordinate RaftApply.
pull/1379/merge
James Phillips 2015-11-15 17:05:19 -08:00
parent 6251a974f8 9972eb2498
commit ff351b289a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
consul/coordinate_endpoint.go
View File

@ -92,9 +92,13 @@ func (c *Coordinate) batchApplyUpdates() error {
t := structs.CoordinateBatchUpdateType | structs.IgnoreUnknownTypeFlag t := structs.CoordinateBatchUpdateType | structs.IgnoreUnknownTypeFlag
slice := updates[start:end] slice := updates[start:end]
if _, err := c.srv.raftApply(t, slice); err != nil { resp, err := c.srv.raftApply(t, slice)
if err != nil {
return err return err
} }
if respErr, ok := resp.(error); ok {
return respErr
}
} }
return nil return nil
} }