mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-01-08 22:23:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

light: add case to catch cancelled contexts within the detector (backport #6701) (#6720)

Browse Source
This commit is contained in:
mergify[bot]
2021-07-14 15:26:03 +02:00
committed by GitHub
parent da9eefd111
commit b69ac23fd2
6 changed files with 105 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
light/client.go
View File

@@ -1152,14 +1152,19 @@ func (c *Client) compareFirstHeaderWithWitnesses(ctx context.Context, h *types.S
and remove witness. Otherwise, use the different primary`, e.WitnessIndex), "witness", c.witnesses[e.WitnessIndex])
return err
case errBadWitness:
// If witness sent us an invalid header, then remove it. If it didn't
// respond or couldn't find the block, then we ignore it and move on to
// the next witness.
if _, ok := e.Reason.(provider.ErrBadLightBlock); ok {
c.logger.Info("Witness sent us invalid header / vals -> removing it",
"witness", c.witnesses[e.WitnessIndex], "err", err)
witnessesToRemove = append(witnessesToRemove, e.WitnessIndex)
// If witness sent us an invalid header, then remove it
c.logger.Info("witness sent an invalid light block, removing...",
"witness", c.witnesses[e.WitnessIndex],
"err", err)
witnessesToRemove = append(witnessesToRemove, e.WitnessIndex)
default: // benign errors can be ignored with the exception of context errors
if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
return err
}
// the witness either didn't respond or didn't have the block. We ignore it.
c.logger.Info("error comparing first header with witness. You may want to consider removing the witness",
"err", err)
}
}