merging: tolerate process interruptions during merging #289
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.
Currently the call to
zoekt-merge-index
does not tollerate process interruptions, which can potentially lead to duplicate indexes. This could be the root cause for the duplicate indexes we see in production.With this PR
merge.Merge
returns a temporary compound shard (*.tmp)zoekt-merge-index
callsmerge.Merge
and is reponsible to delete the input shards and rename the temporary compound shard returned bymerge.Merge
.zoekt-sourcegraph-indexserver
just callszoekt-merge-index
and always expects a consistent state.A positive side-effect is that both merge and explode now behave the same when called from the command line: both remove the input shards and leave the output shards behind.
Test Plan:
Can be reviewed commit by commit.