Fix Needless Warnings when Restoring over Closed Index #75912
Merged
Conversation
This file contains 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
We're trying to delete each file twice and will always warn on the second non-suppressing delete method when there's files to delete.
original-brownbear
added
>non-issue
:Distributed Coordination/Snapshot/Restore
elasticmachine
added
the
Team:Distributed (Obsolete)
|
Pinging @elastic/es-distributed (Team:Distributed) |
| @@ -188,12 +188,12 @@ private void afterRestore(SnapshotFiles snapshotFiles, Store store, StoreFileMet | |||
|
|
|||
| /// now, go over and clean files that are in the store, but were not in the snapshot | |||
| try { | |||
| store.deleteQuiet("restore"); | |||
There was a problem hiding this comment.
I couldn't find any usage of a "restore" file and this seems to be dead code to me, but maybe I'm missing something?
There was a problem hiding this comment.
Looks right to me, the deletion of this file was added way back in 59d9f7e but it's not obvious why.
There was a problem hiding this comment.
Looks like dead code to me too, so +1 on removing
DaveCTurner
approved these changes
Aug 2, 2021
| @@ -188,12 +188,12 @@ private void afterRestore(SnapshotFiles snapshotFiles, Store store, StoreFileMet | |||
|
|
|||
| /// now, go over and clean files that are in the store, but were not in the snapshot | |||
| try { | |||
| store.deleteQuiet("restore"); | |||
There was a problem hiding this comment.
Looks right to me, the deletion of this file was added way back in 59d9f7e but it's not obvious why.
| @@ -188,12 +188,12 @@ private void afterRestore(SnapshotFiles snapshotFiles, Store store, StoreFileMet | |||
|
|
|||
| /// now, go over and clean files that are in the store, but were not in the snapshot | |||
| try { | |||
| store.deleteQuiet("restore"); | |||
| for (String storeFile : store.directory().listAll()) { | |||
| if (Store.isAutogenerated(storeFile) || snapshotFiles.containPhysicalIndexFile(storeFile)) { | |||
| continue; // skip write.lock, checksum files and files that exist in the snapshot | |||
There was a problem hiding this comment.
Suggested change
| continue; // skip write.lock, checksum files and files that exist in the snapshot | |
| continue; // skip write.lock and files that exist in the snapshot |
"checksum files" are not a thing any more (since 5.0?); the javadoc on Store#isAutogenerated has the same cruft as this.
…ngs-restore-over-existing-closed-index
|
Jenkins run elasticsearch-ci/docs |
tlrx
approved these changes
Aug 2, 2021
|
Thanks David + Tanguy! |
original-brownbear
deleted the
fix-spurious-warnings-restore-over-existing-closed-index
branch
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Aug 2, 2021
We're trying to delete each file twice and will always warn on the second non-suppressing delete method when there's files to delete.
original-brownbear
added a commit
that referenced
this pull request
Aug 15, 2021
original-brownbear
restored the
fix-spurious-warnings-restore-over-existing-closed-index
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We're trying to delete each file twice and will always warn on the second non-suppressing
delete method when there's files to delete.