HADOOP-18869: [ABFS] Fixing Behavior of a File System APIs on root path #6003
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
|
💔 -1 overall
This message was automatically generated. |
steveloughran
requested changes
Aug 30, 2023
| final AzureBlobFileSystem fs = getFileSystem(); | ||
| Path testFile = path(AbfsHttpConstants.ROOT_PATH); | ||
| try { | ||
| fs.create(testFile, true); |
There was a problem hiding this comment.
use LambaTestUtils.intercept.
| @@ -146,6 +149,26 @@ public void testCreateNonRecursive2() throws Exception { | |||
| assertIsFile(fs, testFile); | |||
| } | |||
|
|
|||
| @Test | |||
| public void testCreateOnRoot() throws Exception { | |||
There was a problem hiding this comment.
AbstractContractRootDirectoryTest.testCreateFileOverRoot() shoud be doing some of this.
- are those tests running? that's ITestAbfsFileSystemContractRootDirectory
- can you add the createNonRecursive test there?
There was a problem hiding this comment.
I checked and for some reason these tests are getting skipped even after adding the required configuration. Will debug more on this and get back.
There was a problem hiding this comment.
So, I checked further and found the tests were blocked because of the setting here: https://github.com/apache/hadoop/blob/trunk/hadoop-tools/hadoop-azure/src/test/resources/abfs.xml#L20
We have to set the required config fs.contract.test.root-tests-enabled as true here for these tests to run
There was a problem hiding this comment.
aah. well, do that then. it's off by default to stop people accidentally deleting their local disk and then complaining. (this has never happened, but...)
There was a problem hiding this comment.
Makes sense..
Set the config to true.
Also, I was trying to add createNonRecursive in AbstractContractRootDirectoryTest.
Looks like ContractTestUtils does not have support for this HDFS API.
Directly getting File System instance and calling createNonRecursive could cause failure when this test wil run with file systems other than ABFS.
There was a problem hiding this comment.
good point. but at the same time, adding it will see what breaks...if you touch a file in the hdfs source tree (say its contract xml file...it can be left out the final commit) then we see what it does, and for s3a we will find out later and fix.
| // Check if the attribute is retrievable | ||
| fs.setListenerOperation(FSOperationType.GET_ATTR); | ||
| byte[] rv = fs.getXAttr(testPath, attributeName1); | ||
| assertTrue(Arrays.equals(rv, attributeValue1)); |
There was a problem hiding this comment.
AssertJ assertThat() supports array equality, so use it. and add a description
| fs.setListenerOperation(FSOperationType.GET_ATTR); | ||
| byte[] rv = fs.getXAttr(testPath, attributeName1); | ||
| assertTrue(Arrays.equals(rv, attributeValue1)); | ||
| assertEquals(decodedAttributeValue1, fs.getAbfsStore().decodeAttribute(rv)); |
|
|
||
| // Check all the attributes present and previous Attribute not overridden | ||
| rv = fs.getXAttr(testPath, attributeName1); | ||
| assertTrue(Arrays.equals(rv, attributeValue1)); |
There was a problem hiding this comment.
same comments as above. remember i always insist on a description, and want assertJ for anything where it makes sense. save time by doing this from the start
There was a problem hiding this comment.
Sorry for missing this out...
Will remember this before creating a PR in future
| if (f.isRoot()) { | ||
| throw new AbfsRestOperationException(HTTP_CONFLICT, | ||
| AzureServiceErrorCode.PATH_CONFLICT.getErrorCode(), | ||
| "Cannot create file on the root path", |
There was a problem hiding this comment.
make a constant string used in both places
anujmodi2021
force-pushed
the
HADOOP-18869-FixRootOp
branch
from
12dab81 to
b9c2eac
Compare
|
💔 -1 overall
This message was automatically generated. |
steveloughran
requested changes
Sep 7, 2023
| @@ -146,6 +149,26 @@ public void testCreateNonRecursive2() throws Exception { | |||
| assertIsFile(fs, testFile); | |||
| } | |||
|
|
|||
| @Test | |||
| public void testCreateOnRoot() throws Exception { | |||
There was a problem hiding this comment.
aah. well, do that then. it's off by default to stop people accidentally deleting their local disk and then complaining. (this has never happened, but...)
| public void testCreateOnRoot() throws Exception { | ||
| final AzureBlobFileSystem fs = getFileSystem(); | ||
| Path testFile = path(AbfsHttpConstants.ROOT_PATH); | ||
| try { |
There was a problem hiding this comment.
you shouldn't need the double catch. intercept() will return the caught exception, type case to the class of arg 1, so can be asserted on. and if an exception is not the one expected, the stack trace is too important to lose. so rethrow it or use as the cause of an assertion error
AbfsRestOperationException e = intercept(...)
if (e.getStatusCode()!=HTTP_CONFLICT) {
// rethrow if its not the expected one.
throw e;
}
|
🎊 +1 overall
This message was automatically generated. |
steveloughran
approved these changes
Oct 9, 2023
| @@ -146,6 +149,26 @@ public void testCreateNonRecursive2() throws Exception { | |||
| assertIsFile(fs, testFile); | |||
| } | |||
|
|
|||
| @Test | |||
| public void testCreateOnRoot() throws Exception { | |||
There was a problem hiding this comment.
good point. but at the same time, adding it will see what breaks...if you touch a file in the hdfs source tree (say its contract xml file...it can be left out the final commit) then we see what it does, and for s3a we will find out later and fix.
|
merge to trunk..as usual do a pr and retest against branch-3.3 for a merge there |
|
ok, i just gave the wrong credit. will revert and reappy with the correct author. sorry, its just I had Anmol on clipboard |
asfgit
pushed a commit
that referenced
this pull request
Oct 9, 2023
…6003) Contributed by Anuj Modi
anujmodi2021
added a commit
to anujmodi2021/hadoop
that referenced
this pull request
Nov 15, 2023
…pache#6003) Contributed by Anuj Modi
jiajunmao
pushed a commit
to jiajunmao/hadoop-MLEC
that referenced
this pull request
Feb 6, 2024
…pache#6003) Contributed by Anmol Asrani
jiajunmao
pushed a commit
to jiajunmao/hadoop-MLEC
that referenced
this pull request
Feb 6, 2024
…ot path (apache#6003)" This reverts commit 6c6df40. ...so as to give the correct credit
jiajunmao
pushed a commit
to jiajunmao/hadoop-MLEC
that referenced
this pull request
Feb 6, 2024
…pache#6003) Contributed by Anuj Modi
steveloughran
pushed a commit
that referenced
this pull request
Mar 25, 2024
…r() on root path (#6592) This reverts most of HADOOP-18869: [ABFS] Fix behavior of a File System APIs on root path (#6003). Calling getXAttr("/") or setXAttr("/") on an abfs container will fail with `Operation failed: "The request URI is invalid.", HTTP 400 Bad Request` This change is to ensure: * Consistency across ADLS clients * Consistency across authentication mechanisms. Contributed by Anuj Modi
steveloughran
pushed a commit
that referenced
this pull request
Mar 25, 2024
…r() on root path (#6592) This reverts most of HADOOP-18869: [ABFS] Fix behavior of a File System APIs on root path (#6003). Calling getXAttr("/") or setXAttr("/") on an abfs container will fail with `Operation failed: "The request URI is invalid.", HTTP 400 Bad Request` This change is to ensure: * Consistency across ADLS clients * Consistency across authentication mechanisms. Contributed by Anuj Modi
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.
Description of PR
Jira Ticket: https://issues.apache.org/jira/browse/HADOOP-18869
Following changes are included in this PR:
Also, ABFS used DFS endpoint to interact with Azure services. As per the official documentation, these operations on DFS endpoint supports only ASCII characters. As a ix tests were modified to work only with ASCII characters.
How was this patch tested?
Existing tests were modified and more tests were added.
Whole test suite was ran to verify the changes. Test results pasted below.
For code changes:
LICENSE,LICENSE-binary,NOTICE-binaryfiles?