-
Notifications
You must be signed in to change notification settings - Fork 9.2k
HADOOP-19089: [ABFS] Reverting Back Support of setXAttr() and getXAttr() on root path #6592
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
Merged
steveloughran
merged 5 commits into
apache:trunk
from
anujmodi2021:revertContainerAttributes
Mar 25, 2024
Merged
Changes from 4 commits
Commits
Show all changes
5 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
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 |
|---|---|---|
|
|
@@ -1229,6 +1229,11 @@ The fix is to mimic the ownership to the local OS user, by adding the below prop | |
|
|
||
| Once the above properties are configured, `hdfs dfs -ls abfs://[email protected]/` shows the ADLS Gen2 files/directories are now owned by 'user1'. | ||
|
|
||
| ## <a name="KnownIssues"></a> Known Issues | ||
|
|
||
| Following failures are known and expected to fail as of now. | ||
| 1. AzureBlobFileSystem.setXAttr() and AzureBlobFileSystem.getXAttr() will fail when attempted on root ("/") path with `Operation failed: "The request URI is invalid.", HTTP 400 Bad Request` | ||
|
|
||
| ## <a name="testing"></a> Testing ABFS | ||
|
|
||
| See the relevant section in [Testing Azure](testing_azure.html). | ||
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 |
|---|---|---|
|
|
@@ -27,8 +27,11 @@ | |
| import org.apache.hadoop.fs.Path; | ||
| import org.apache.hadoop.fs.XAttrSetFlag; | ||
| import org.apache.hadoop.fs.azurebfs.constants.FSOperationType; | ||
| import org.apache.hadoop.fs.azurebfs.contracts.exceptions.AbfsRestOperationException; | ||
| import org.apache.hadoop.fs.azurebfs.utils.TracingHeaderValidator; | ||
|
|
||
| import static java.net.HttpURLConnection.HTTP_BAD_REQUEST; | ||
| import static org.apache.hadoop.fs.azurebfs.constants.AbfsHttpConstants.ROOT_PATH; | ||
| import static org.apache.hadoop.test.LambdaTestUtils.intercept; | ||
|
|
||
| /** | ||
|
|
@@ -45,8 +48,7 @@ public ITestAzureBlobFileSystemAttributes() throws Exception { | |
| @Test | ||
| public void testSetGetXAttr() throws Exception { | ||
| AzureBlobFileSystem fs = getFileSystem(); | ||
| AbfsConfiguration conf = fs.getAbfsStore().getAbfsConfiguration(); | ||
| final Path testPath = path("setGetXAttr"); | ||
| final Path testPath = path(getMethodName()); | ||
| fs.create(testPath); | ||
| testGetSetXAttrHelper(fs, testPath); | ||
| } | ||
|
|
@@ -56,7 +58,7 @@ public void testSetGetXAttrCreateReplace() throws Exception { | |
| AzureBlobFileSystem fs = getFileSystem(); | ||
| byte[] attributeValue = fs.getAbfsStore().encodeAttribute("one"); | ||
| String attributeName = "user.someAttribute"; | ||
| Path testFile = path("createReplaceXAttr"); | ||
| Path testFile = path(getMethodName()); | ||
|
|
||
| // after creating a file, it must be possible to create a new xAttr | ||
| touch(testFile); | ||
|
|
@@ -75,7 +77,7 @@ public void testSetGetXAttrReplace() throws Exception { | |
| byte[] attributeValue1 = fs.getAbfsStore().encodeAttribute("one"); | ||
| byte[] attributeValue2 = fs.getAbfsStore().encodeAttribute("two"); | ||
| String attributeName = "user.someAttribute"; | ||
| Path testFile = path("replaceXAttr"); | ||
| Path testFile = path(getMethodName()); | ||
|
|
||
| // after creating a file, it must not be possible to replace an xAttr | ||
| intercept(IOException.class, () -> { | ||
|
|
@@ -91,13 +93,6 @@ public void testSetGetXAttrReplace() throws Exception { | |
| .containsExactly(attributeValue2); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetSetXAttrOnRoot() throws Exception { | ||
| AzureBlobFileSystem fs = getFileSystem(); | ||
| final Path testPath = new Path("/"); | ||
| testGetSetXAttrHelper(fs, testPath); | ||
| } | ||
|
|
||
| private void testGetSetXAttrHelper(final AzureBlobFileSystem fs, | ||
| final Path testPath) throws Exception { | ||
|
|
||
|
|
@@ -154,4 +149,24 @@ private void testGetSetXAttrHelper(final AzureBlobFileSystem fs, | |
| .describedAs("Retrieved Attribute Does not Matches in Decoded Form") | ||
| .isEqualTo(decodedAttributeValue2); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetSetXAttrOnRoot() throws Exception { | ||
| AzureBlobFileSystem fs = getFileSystem(); | ||
| String attributeName = "user.attribute1"; | ||
| byte[] attributeValue = fs.getAbfsStore().encodeAttribute("hi"); | ||
| final Path testPath = new Path(ROOT_PATH); | ||
|
|
||
| try { | ||
| fs.getXAttr(testPath, attributeName); | ||
| } catch (AbfsRestOperationException e) { | ||
| Assertions.assertThat(e.getStatusCode()).isEqualTo(HTTP_BAD_REQUEST); | ||
|
||
| } | ||
|
|
||
| try { | ||
| fs.setXAttr(testPath, attributeName, attributeValue, CREATE_FLAG); | ||
| } catch (AbfsRestOperationException e) { | ||
| Assertions.assertThat(e.getStatusCode()).isEqualTo(HTTP_BAD_REQUEST); | ||
| } | ||
| } | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
To prevent revert add of getFileSystemProperties and setFileSystemProperties for getXAttr / setXAttr in future, should we not remove this method, and additionally assert that the getFileSystemProperties and setFileSystemProperties of store are not called, but setPathProperties and getPathStatus of store is called..
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.
Lets add an assert that this should throw 4xx error.
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.
Reason for this comment:
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.
Makes sense.
Added back the negative test.