Allow rename() to overwrite, fix an uncaught ex and reenable UT #18263
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
apc999
force-pushed
the
main
branch
2 times, most recently
from
2fec0ec
to
b597c61
Compare
voddle
commented
Oct 27, 2023
dora/core/client/fs/src/main/java/alluxio/client/file/DoraCacheFileSystem.java
Show resolved
Hide resolved
voddle
commented
Oct 27, 2023
| @@ -463,6 +463,7 @@ message RenamePOptions { | |||
| optional FileSystemMasterCommonPOptions commonOptions = 1; | |||
| optional bool persist = 2; | |||
| optional S3SyntaxOptions s3SyntaxOptions = 3; | |||
| optional bool overwrite = 4; | |||
There was a problem hiding this comment.
add overwrite flag and corresponding check to rename method.
|
Also, not sure what to do about |
YichuanSun
reviewed
Nov 2, 2023
dora/core/client/fs/src/main/java/alluxio/client/file/DoraCacheFileSystem.java
Outdated
Show resolved
Hide resolved
jiacheliu3
reviewed
Nov 3, 2023
| if (ex instanceof StatusRuntimeException) { | ||
| Status.Code code = ((StatusRuntimeException) ex).getStatus().getCode(); | ||
| if (code == Status.FAILED_PRECONDITION.getCode()) { | ||
| // throw new RuntimeException(ex.getMessage()); |
There was a problem hiding this comment.
just not sure this is the appropriate exception to throw
There was a problem hiding this comment.
for the FAILED_PRECONDITION, I think it may be not allowed to rename the file to file but it's ok to rename the file into a directory. so we may need a log here and wait for the result of 2nd try?
Comment on lines
702
to
704
| if (src == dst) { | ||
| return true; | ||
| } |
There was a problem hiding this comment.
Suggested change
| if (src == dst) { | |
| return true; | |
| } | |
| if (src.equals(dst)) { | |
| LOG.debug("Renaming {} to the same location", src); | |
| return true; | |
| } |
jiacheliu3
reviewed
Nov 3, 2023
| * @param dstPath srcPath | ||
| * @return true in success, false if fail | ||
| */ | ||
| public boolean renameInternal(Path src, Path dst, AlluxioURI srcPath, AlluxioURI dstPath) { |
There was a problem hiding this comment.
i tried to rename this one
private boolean tryMoveIntoDirectory(AlluxioURI srcPath, AlluxioURI dstPath)
throws IOException, AlluxioException {
ensureExists(srcPath);
URIStatus dstStatus;
dstStatus = mFileSystem.getStatus(dstPath);
// If the destination is an existing folder, try to move the src into the folder
if (dstStatus != null && dstStatus.isFolder()) {
dstPath = dstPath.joinUnsafe(srcPath.getName());
} else {
return false;
}
mFileSystem.rename(srcPath, dstPath);
return true;
}
Comment on lines
713
to
718
| throw toHdfsIOException(e); | ||
| LOG.warn("rename failed: {}", toHdfsIOException(e)); | ||
| return renameInternal(src, dst, srcPath, dstPath); | ||
| } catch (AlluxioException e) { | ||
| return renameInternal(src, dst, srcPath, dstPath); |
There was a problem hiding this comment.
i had to write try-catch inside this catch but i figure it's ok
} catch (AlluxioRuntimeException | AlluxioException e) {
Exception exToLog = e;
if (e instanceof AlluxioRuntimeException) {
exToLog = toHdfsIOException((AlluxioRuntimeException) e);
}
try {
boolean res = tryMoveIntoDirectory(srcPath, dstPath);
if (!res) {
LOG.warn("Failed to rename file and dst {} is not a directory", dst, exToLog);
}
return res;
} catch (IOException | AlluxioException | AlluxioRuntimeException e2) {
LOG.error("Failed to rename file {} and failed to move into dst directory {}",
src, dst, exToLog);
return false;
}
There was a problem hiding this comment.
can we package the try-catch into the tryMoveIntoDirectory? then we can reduce the nested try-catch.
There was a problem hiding this comment.
i just wanted to have the ex from the 1st try AlluxioRuntimeException | AlluxioException e and the ex from the tryMoveIntoDirectory together. So I can decide which one to log, and maybe log both?
dora/core/client/hdfs/src/main/java/alluxio/hadoop/AbstractFileSystem.java
Show resolved
Hide resolved
Comment on lines
713
to
718
| throw toHdfsIOException(e); | ||
| LOG.warn("rename failed: {}", toHdfsIOException(e)); | ||
| return renameInternal(src, dst, srcPath, dstPath); | ||
| } catch (AlluxioException e) { | ||
| return renameInternal(src, dst, srcPath, dstPath); |
There was a problem hiding this comment.
can we package the try-catch into the tryMoveIntoDirectory? then we can reduce the nested try-catch.
jiacheliu3
reviewed
Nov 3, 2023
dora/core/client/hdfs/src/main/java/alluxio/hadoop/AbstractFileSystem.java
Show resolved
Hide resolved
dora/core/client/hdfs/src/main/java/alluxio/hadoop/AbstractFileSystem.java
Outdated
Show resolved
Hide resolved
jiacheliu3
reviewed
Nov 3, 2023
dora/core/client/hdfs/src/main/java/alluxio/hadoop/AbstractFileSystem.java
Outdated
Show resolved
Hide resolved
dora/core/client/hdfs/src/main/java/alluxio/hadoop/AbstractFileSystem.java
Outdated
Show resolved
Hide resolved
dora/core/client/hdfs/src/main/java/alluxio/hadoop/AbstractFileSystem.java
Show resolved
Hide resolved
| if (ex instanceof StatusRuntimeException) { | ||
| Status.Code code = ((StatusRuntimeException) ex).getStatus().getCode(); | ||
| if (code == Status.FAILED_PRECONDITION.getCode()) { | ||
| // throw new RuntimeException(ex.getMessage()); |
jiacheliu3
reviewed
Nov 8, 2023
dora/core/client/fs/src/main/java/alluxio/client/file/DoraCacheFileSystem.java
Outdated
Show resolved
Hide resolved
YichuanSun
reviewed
Nov 9, 2023
dora/core/client/fs/src/main/java/alluxio/client/file/DoraCacheFileSystem.java
Show resolved
Hide resolved
jiacheliu3
changed the title
|
Automated checks report:
Some checks failed. Please fix the reported issues and reply 'alluxio-bot, check this please' to re-run checks. |
jiacheliu3
changed the title
|
Automated checks report:
All checks passed! |
YichuanSun
approved these changes
Nov 10, 2023
|
alluxio-bot, merge this please |
ssz1997
pushed a commit
to ssz1997/alluxio
that referenced
this pull request
Dec 15, 2023
### What changes are proposed in this pull request? As the title states, this PR does a few things: 1. Allow rename() to overwrite an existing path, if specified in the option 2. The method `rename` in `AbstractFileSystem`, now will process the input path and rerun `rename` method when caught `AlluxioException` or `AlluxioRuntimeException`. Instead of log the exception and return end. 3. Also add some path checks during the rename 4. Reenable `FileSystemRenameIntegrationTest` by adding configs to `LocalAlluxioClusterResource` and reenable UT cases. pr-link: Alluxio#18263 change-id: cid-2870bf87fea8a3b2419e5b10a05423ff2dede6a2
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.
What changes are proposed in this pull request?
As the title states, this PR does a few things:
renameinAbstractFileSystem, now will process the input path and rerunrenamemethod when caughtAlluxioExceptionorAlluxioRuntimeException. Instead of log the exception and return end.FileSystemRenameIntegrationTestby adding configs toLocalAlluxioClusterResourceand reenable UT cases.