-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Warm Index local file delete failure fix #19110
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
himkak
wants to merge
2
commits into
opensearch-project:main
Choose a base branch
from
himkak:himkak/warmIndexLocalFileDeletionFailure
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,6 +32,7 @@ | |
|
||
import java.io.FileNotFoundException; | ||
import java.io.IOException; | ||
import java.nio.file.AccessDeniedException; | ||
import java.nio.file.Files; | ||
import java.nio.file.NoSuchFileException; | ||
import java.nio.file.Path; | ||
|
@@ -188,7 +189,18 @@ not present in remote as well (due to metadata refresh). In such scenarios listA | |
logger.debug("The file [{}] exists in local but not part of FileCache, deleting it from local", blockFile); | ||
localDirectory.deleteFile(blockFile); | ||
} else { | ||
fileCache.remove(getFilePath(blockFile)); | ||
// here the file is to be deleted both from FileCache and the local directory. | ||
Path blockFilePath = getFilePath(blockFile); | ||
try { | ||
fileCache.remove(blockFilePath); | ||
}catch(Exception e){ | ||
if (e.getCause() instanceof AccessDeniedException) { | ||
localDirectory.deleteFile(blockFile); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Better to add a debug log as well on this, might prove useful for understanding how frequent the deletions fail |
||
} else { | ||
logger.error("Exception while removing file [{}] from FileCache. Exception:", blockFilePath, e); | ||
throw e; | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there any way we can catch a specific type of Exception in catch instead of getting the exception from cause and doing an instanceof check ?
We should avoid instanceof checks if possible.