cmd/utils: return ErrImportInterrupted sentinel from batch-import interrupt#35153
Open
cuiweixie wants to merge 1 commit into
Open
cmd/utils: return ErrImportInterrupted sentinel from batch-import interrupt#35153cuiweixie wants to merge 1 commit into
cuiweixie wants to merge 1 commit into
Conversation
…errupt
ImportChain has two interrupt checkpoints. The one before loading a batch
correctly returns the exported ErrImportInterrupted sentinel, but the one
before inserting a batch returned a freshly constructed
errors.New("interrupted") instead.
The caller in cmd/geth/chaincmd.go detects interruption with
`err == utils.ErrImportInterrupted` to stop processing the remaining
files in a multi-file import. A fresh error value never compares equal to
the sentinel, so an interrupt caught at this checkpoint was treated as an
ordinary per-file failure and the loop kept importing subsequent files.
Return the ErrImportInterrupted sentinel here too so both checkpoints are
recognized by the caller.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ImportChain has two interrupt checkpoints. The one before loading a batch correctly returns the exported ErrImportInterrupted sentinel, but the one before inserting a batch returned a freshly constructed errors.New("interrupted") instead.
The caller in cmd/geth/chaincmd.go detects interruption with
err == utils.ErrImportInterruptedto stop processing the remaining files in a multi-file import. A fresh error value never compares equal to the sentinel, so an interrupt caught at this checkpoint was treated as an ordinary per-file failure and the loop kept importing subsequent files.Return the ErrImportInterrupted sentinel here too so both checkpoints are recognized by the caller.