Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Copy link
Contributor

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.

localDirectory.deleteFile(blockFile);
Copy link
Contributor

Choose a reason for hiding this comment

The 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;
}
}
}
}
}
Expand Down
Loading