This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 882378c3e9d6bd16884655927a290586350782bb
Author: Steve Loughran <ste...@cloudera.com>
AuthorDate: Mon Oct 9 20:03:54 2023 +0100
Revert "HADOOP-18869: [ABFS] Fix behavior of a File System APIs on root
path (#6003)"
This reverts commit 6c6df40d35e69f0340ab7a9afae3f96be1f497ca.
...so as to give the correct credit
---
.../hadoop/fs/azurebfs/AzureBlobFileSystem.java | 42 ++-------
.../fs/azurebfs/AzureBlobFileSystemStore.java | 2 +-
.../hadoop/fs/azurebfs/services/AbfsErrors.java | 2 +-
.../ITestAzureBlobFileSystemAttributes.java | 104 ++++++---------------
.../azurebfs/ITestAzureBlobFileSystemCreate.java | 25 +----
.../hadoop-azure/src/test/resources/abfs.xml | 2 +-
6 files changed, 40 insertions(+), 137 deletions(-)
diff --git
a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java
index b234f76d5d9d..8f7fbc570221 100644
---
a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java
+++
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java
@@ -110,7 +110,6 @@ import org.apache.hadoop.util.DurationInfo;
import org.apache.hadoop.util.LambdaUtils;
import org.apache.hadoop.util.Progressable;
-import static java.net.HttpURLConnection.HTTP_CONFLICT;
import static
org.apache.hadoop.fs.CommonConfigurationKeys.IOSTATISTICS_LOGGING_LEVEL;
import static
org.apache.hadoop.fs.CommonConfigurationKeys.IOSTATISTICS_LOGGING_LEVEL_DEFAULT;
import static
org.apache.hadoop.fs.Options.OpenFileOptions.FS_OPTION_OPENFILE_STANDARD_OPTIONS;
@@ -121,7 +120,6 @@ import static
org.apache.hadoop.fs.azurebfs.constants.ConfigurationKeys.FS_AZURE
import static
org.apache.hadoop.fs.azurebfs.constants.FileSystemConfigurations.BLOCK_UPLOAD_ACTIVE_BLOCKS_DEFAULT;
import static
org.apache.hadoop.fs.azurebfs.constants.FileSystemConfigurations.DATA_BLOCKS_BUFFER_DEFAULT;
import static
org.apache.hadoop.fs.azurebfs.constants.InternalConstants.CAPABILITY_SAFE_READAHEAD;
-import static
org.apache.hadoop.fs.azurebfs.services.AbfsErrors.ERR_CREATE_ON_ROOT;
import static
org.apache.hadoop.fs.impl.PathCapabilitiesSupport.validatePathCapabilityArgs;
import static
org.apache.hadoop.fs.statistics.IOStatisticsLogging.logIOStatisticsAtLevel;
import static
org.apache.hadoop.util.functional.RemoteIterators.filteringRemoteIterator;
@@ -326,12 +324,6 @@ public class AzureBlobFileSystem extends FileSystem
statIncrement(CALL_CREATE);
trailingPeriodCheck(f);
- if (f.isRoot()) {
- throw new AbfsRestOperationException(HTTP_CONFLICT,
- AzureServiceErrorCode.PATH_CONFLICT.getErrorCode(),
- ERR_CREATE_ON_ROOT,
- null);
- }
Path qualifiedPath = makeQualified(f);
@@ -356,12 +348,6 @@ public class AzureBlobFileSystem extends FileSystem
final Progressable progress) throws IOException {
statIncrement(CALL_CREATE_NON_RECURSIVE);
- if (f.isRoot()) {
- throw new AbfsRestOperationException(HTTP_CONFLICT,
- AzureServiceErrorCode.PATH_CONFLICT.getErrorCode(),
- ERR_CREATE_ON_ROOT,
- null);
- }
final Path parent = f.getParent();
TracingContext tracingContext = new TracingContext(clientCorrelationId,
fileSystemId, FSOperationType.CREATE_NON_RECURSIVE,
tracingHeaderFormat,
@@ -979,25 +965,15 @@ public class AzureBlobFileSystem extends FileSystem
TracingContext tracingContext = new TracingContext(clientCorrelationId,
fileSystemId, FSOperationType.SET_ATTR, true, tracingHeaderFormat,
listener);
- Hashtable<String, String> properties;
+ Hashtable<String, String> properties = abfsStore
+ .getPathStatus(qualifiedPath, tracingContext);
String xAttrName = ensureValidAttributeName(name);
-
- if (path.isRoot()) {
- properties = abfsStore.getFilesystemProperties(tracingContext);
- } else {
- properties = abfsStore.getPathStatus(qualifiedPath, tracingContext);
- }
-
boolean xAttrExists = properties.containsKey(xAttrName);
XAttrSetFlag.validate(name, xAttrExists, flag);
String xAttrValue = abfsStore.decodeAttribute(value);
properties.put(xAttrName, xAttrValue);
- if (path.isRoot()) {
- abfsStore.setFilesystemProperties(properties, tracingContext);
- } else {
- abfsStore.setPathProperties(qualifiedPath, properties, tracingContext);
- }
+ abfsStore.setPathProperties(qualifiedPath, properties, tracingContext);
} catch (AzureBlobFileSystemException ex) {
checkException(path, ex);
}
@@ -1029,15 +1005,9 @@ public class AzureBlobFileSystem extends FileSystem
TracingContext tracingContext = new TracingContext(clientCorrelationId,
fileSystemId, FSOperationType.GET_ATTR, true, tracingHeaderFormat,
listener);
- Hashtable<String, String> properties;
+ Hashtable<String, String> properties = abfsStore
+ .getPathStatus(qualifiedPath, tracingContext);
String xAttrName = ensureValidAttributeName(name);
-
- if (path.isRoot()) {
- properties = abfsStore.getFilesystemProperties(tracingContext);
- } else {
- properties = abfsStore.getPathStatus(qualifiedPath, tracingContext);
- }
-
if (properties.containsKey(xAttrName)) {
String xAttrValue = properties.get(xAttrName);
value = abfsStore.encodeAttribute(xAttrValue);
@@ -1518,7 +1488,7 @@ public class AzureBlobFileSystem extends FileSystem
case HttpURLConnection.HTTP_NOT_FOUND:
throw (IOException) new FileNotFoundException(message)
.initCause(exception);
- case HTTP_CONFLICT:
+ case HttpURLConnection.HTTP_CONFLICT:
throw (IOException) new FileAlreadyExistsException(message)
.initCause(exception);
case HttpURLConnection.HTTP_FORBIDDEN:
diff --git
a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java
index 4b356ceef06d..ff37ee5ee901 100644
---
a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java
+++
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java
@@ -494,7 +494,7 @@ public class AzureBlobFileSystemStore implements Closeable,
ListingSupport {
final Hashtable<String, String> properties, TracingContext
tracingContext)
throws AzureBlobFileSystemException {
try (AbfsPerfInfo perfInfo = startTracking("setPathProperties",
"setPathProperties")){
- LOG.debug("setPathProperties for filesystem: {} path: {} with
properties: {}",
+ LOG.debug("setFilesystemProperties for filesystem: {} path: {} with
properties: {}",
client.getFileSystem(),
path,
properties);
diff --git
a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsErrors.java
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsErrors.java
index 86285e08f2ce..e15795efee68 100644
---
a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsErrors.java
+++
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsErrors.java
@@ -48,6 +48,6 @@ public final class AbfsErrors {
+ "operation";
public static final String ERR_NO_LEASE_THREADS = "Lease desired but no
lease threads "
+ "configured, set " + FS_AZURE_LEASE_THREADS;
- public static final String ERR_CREATE_ON_ROOT = "Cannot create file over
root path";
+
private AbfsErrors() {}
}
diff --git
a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemAttributes.java
b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemAttributes.java
index 7fe229c519fb..beb7d0ebaaa8 100644
---
a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemAttributes.java
+++
b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemAttributes.java
@@ -21,7 +21,7 @@ package org.apache.hadoop.fs.azurebfs;
import java.io.IOException;
import java.util.EnumSet;
-import org.assertj.core.api.Assertions;
+import org.junit.Assume;
import org.junit.Test;
import org.apache.hadoop.fs.Path;
@@ -46,14 +46,37 @@ public class ITestAzureBlobFileSystemAttributes extends
AbstractAbfsIntegrationT
public void testSetGetXAttr() throws Exception {
AzureBlobFileSystem fs = getFileSystem();
AbfsConfiguration conf = fs.getAbfsStore().getAbfsConfiguration();
- final Path testPath = path("setGetXAttr");
- fs.create(testPath);
- testGetSetXAttrHelper(fs, testPath);
+ Assume.assumeTrue(getIsNamespaceEnabled(fs));
+
+ byte[] attributeValue1 = fs.getAbfsStore().encodeAttribute("hi");
+ byte[] attributeValue2 = fs.getAbfsStore().encodeAttribute("你好");
+ String attributeName1 = "user.asciiAttribute";
+ String attributeName2 = "user.unicodeAttribute";
+ Path testFile = path("setGetXAttr");
+
+ // after creating a file, the xAttr should not be present
+ touch(testFile);
+ assertNull(fs.getXAttr(testFile, attributeName1));
+
+ // after setting the xAttr on the file, the value should be retrievable
+ fs.registerListener(
+ new TracingHeaderValidator(conf.getClientCorrelationId(),
+ fs.getFileSystemId(), FSOperationType.SET_ATTR, true, 0));
+ fs.setXAttr(testFile, attributeName1, attributeValue1);
+ fs.setListenerOperation(FSOperationType.GET_ATTR);
+ assertArrayEquals(attributeValue1, fs.getXAttr(testFile, attributeName1));
+ fs.registerListener(null);
+
+ // after setting a second xAttr on the file, the first xAttr values should
not be overwritten
+ fs.setXAttr(testFile, attributeName2, attributeValue2);
+ assertArrayEquals(attributeValue1, fs.getXAttr(testFile, attributeName1));
+ assertArrayEquals(attributeValue2, fs.getXAttr(testFile, attributeName2));
}
@Test
public void testSetGetXAttrCreateReplace() throws Exception {
AzureBlobFileSystem fs = getFileSystem();
+ Assume.assumeTrue(getIsNamespaceEnabled(fs));
byte[] attributeValue = fs.getAbfsStore().encodeAttribute("one");
String attributeName = "user.someAttribute";
Path testFile = path("createReplaceXAttr");
@@ -61,9 +84,7 @@ public class ITestAzureBlobFileSystemAttributes extends
AbstractAbfsIntegrationT
// after creating a file, it must be possible to create a new xAttr
touch(testFile);
fs.setXAttr(testFile, attributeName, attributeValue, CREATE_FLAG);
- Assertions.assertThat(fs.getXAttr(testFile, attributeName))
- .describedAs("Retrieved Attribute Value is Not as Expected")
- .containsExactly(attributeValue);
+ assertArrayEquals(attributeValue, fs.getXAttr(testFile, attributeName));
// however after the xAttr is created, creating it again must fail
intercept(IOException.class, () -> fs.setXAttr(testFile, attributeName,
attributeValue, CREATE_FLAG));
@@ -72,6 +93,7 @@ public class ITestAzureBlobFileSystemAttributes extends
AbstractAbfsIntegrationT
@Test
public void testSetGetXAttrReplace() throws Exception {
AzureBlobFileSystem fs = getFileSystem();
+ Assume.assumeTrue(getIsNamespaceEnabled(fs));
byte[] attributeValue1 = fs.getAbfsStore().encodeAttribute("one");
byte[] attributeValue2 = fs.getAbfsStore().encodeAttribute("two");
String attributeName = "user.someAttribute";
@@ -86,72 +108,6 @@ public class ITestAzureBlobFileSystemAttributes extends
AbstractAbfsIntegrationT
// however after the xAttr is created, replacing it must succeed
fs.setXAttr(testFile, attributeName, attributeValue1, CREATE_FLAG);
fs.setXAttr(testFile, attributeName, attributeValue2, REPLACE_FLAG);
- Assertions.assertThat(fs.getXAttr(testFile, attributeName))
- .describedAs("Retrieved Attribute Value is Not as Expected")
- .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 {
-
- String attributeName1 = "user.attribute1";
- String attributeName2 = "user.attribute2";
- String decodedAttributeValue1 = "hi";
- String decodedAttributeValue2 = "hello";
- byte[] attributeValue1 =
fs.getAbfsStore().encodeAttribute(decodedAttributeValue1);
- byte[] attributeValue2 =
fs.getAbfsStore().encodeAttribute(decodedAttributeValue2);
-
- // Attribute not present initially
- Assertions.assertThat(fs.getXAttr(testPath, attributeName1))
- .describedAs("Cannot get attribute before setting it")
- .isNull();
- Assertions.assertThat(fs.getXAttr(testPath, attributeName2))
- .describedAs("Cannot get attribute before setting it")
- .isNull();
-
- // Set the Attributes
- fs.registerListener(
- new TracingHeaderValidator(fs.getAbfsStore().getAbfsConfiguration()
- .getClientCorrelationId(),
- fs.getFileSystemId(), FSOperationType.SET_ATTR, true, 0));
- fs.setXAttr(testPath, attributeName1, attributeValue1);
-
- // Check if the attribute is retrievable
- fs.setListenerOperation(FSOperationType.GET_ATTR);
- byte[] rv = fs.getXAttr(testPath, attributeName1);
- Assertions.assertThat(rv)
- .describedAs("Retrieved Attribute Does not Matches in Encoded Form")
- .containsExactly(attributeValue1);
- Assertions.assertThat(fs.getAbfsStore().decodeAttribute(rv))
- .describedAs("Retrieved Attribute Does not Matches in Decoded Form")
- .isEqualTo(decodedAttributeValue1);
- fs.registerListener(null);
-
- // Set the second Attribute
- fs.setXAttr(testPath, attributeName2, attributeValue2);
-
- // Check all the attributes present and previous Attribute not overridden
- rv = fs.getXAttr(testPath, attributeName1);
- Assertions.assertThat(rv)
- .describedAs("Retrieved Attribute Does not Matches in Encoded Form")
- .containsExactly(attributeValue1);
- Assertions.assertThat(fs.getAbfsStore().decodeAttribute(rv))
- .describedAs("Retrieved Attribute Does not Matches in Decoded Form")
- .isEqualTo(decodedAttributeValue1);
-
- rv = fs.getXAttr(testPath, attributeName2);
- Assertions.assertThat(rv)
- .describedAs("Retrieved Attribute Does not Matches in Encoded Form")
- .containsExactly(attributeValue2);
- Assertions.assertThat(fs.getAbfsStore().decodeAttribute(rv))
- .describedAs("Retrieved Attribute Does not Matches in Decoded Form")
- .isEqualTo(decodedAttributeValue2);
+ assertArrayEquals(attributeValue2, fs.getXAttr(testFile, attributeName));
}
}
diff --git
a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemCreate.java
b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemCreate.java
index d0b3ff297400..d9a3cea089f6 100644
---
a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemCreate.java
+++
b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemCreate.java
@@ -25,7 +25,6 @@ import java.lang.reflect.Field;
import java.util.EnumSet;
import java.util.UUID;
-import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.apache.hadoop.conf.Configuration;
@@ -34,7 +33,6 @@ import org.apache.hadoop.fs.FileAlreadyExistsException;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.azurebfs.constants.AbfsHttpConstants;
import org.apache.hadoop.fs.permission.FsAction;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.test.GenericTestUtils;
@@ -148,26 +146,6 @@ public class ITestAzureBlobFileSystemCreate extends
assertIsFile(fs, testFile);
}
- @Test
- public void testCreateOnRoot() throws Exception {
- final AzureBlobFileSystem fs = getFileSystem();
- Path testFile = path(AbfsHttpConstants.ROOT_PATH);
- AbfsRestOperationException ex =
intercept(AbfsRestOperationException.class, () ->
- fs.create(testFile, true));
- if (ex.getStatusCode() != HTTP_CONFLICT) {
- // Request should fail with 409.
- throw ex;
- }
-
- ex = intercept(AbfsRestOperationException.class, () ->
- fs.createNonRecursive(testFile, FsPermission.getDefault(),
- false, 1024, (short) 1, 1024, null));
- if (ex.getStatusCode() != HTTP_CONFLICT) {
- // Request should fail with 409.
- throw ex;
- }
- }
-
/**
* Attempts to use to the ABFS stream after it is closed.
*/
@@ -212,8 +190,7 @@ public class ITestAzureBlobFileSystemCreate extends
// the exception raised in close() must be in the caught exception's
// suppressed list
Throwable[] suppressed = fnfe.getSuppressed();
- Assertions.assertThat(suppressed.length)
- .describedAs("suppressed count should be 1").isEqualTo(1);
+ assertEquals("suppressed count", 1, suppressed.length);
Throwable inner = suppressed[0];
if (!(inner instanceof IOException)) {
throw inner;
diff --git a/hadoop-tools/hadoop-azure/src/test/resources/abfs.xml
b/hadoop-tools/hadoop-azure/src/test/resources/abfs.xml
index 007ca2abd6b9..f06e5cac9b8b 100644
--- a/hadoop-tools/hadoop-azure/src/test/resources/abfs.xml
+++ b/hadoop-tools/hadoop-azure/src/test/resources/abfs.xml
@@ -19,7 +19,7 @@
<configuration xmlns:xi="http://www.w3.org/2001/XInclude";>
<property>
<name>fs.contract.test.root-tests-enabled</name>
- <value>true</value>
+ <value>false</value>
</property>
<property>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
