From cfaf21a4ba624330224a4f8519d2e9ea73814505 Mon Sep 17 00:00:00 2001 From: Da Zhou Date: Fri, 8 Mar 2019 13:53:44 +0000 Subject: [PATCH] HADOOP-16169. ABFS: Bug fix for getPathProperties. Author: Da Zhou (cherry picked from commit e0260417ade5568ae37dcc3753aea0d1e0fd701b) --- .../hadoop/fs/azurebfs/AzureBlobFileSystemStore.java | 12 ++++++------ .../hadoop/fs/azurebfs/services/AbfsClient.java | 4 ++-- .../fs/azurebfs/ITestFileSystemProperties.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) 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 dbf78ecb02f..f1ece3647ab 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 @@ -276,13 +276,13 @@ public class AzureBlobFileSystemStore { client.setFilesystemProperties(commaSeparatedProperties); } - public Hashtable getPathProperties(final Path path) throws AzureBlobFileSystemException { - LOG.debug("getPathProperties for filesystem: {} path: {}", + public Hashtable getPathStatus(final Path path) throws AzureBlobFileSystemException { + LOG.debug("getPathStatus for filesystem: {} path: {}", client.getFileSystem(), path); final Hashtable parsedXmsProperties; - final AbfsRestOperation op = client.getPathProperties(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path), isNamespaceEnabled); + final AbfsRestOperation op = client.getPathStatus(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path)); final String xMsProperties = op.getResult().getResponseHeader(HttpHeaderConfigurations.X_MS_PROPERTIES); @@ -364,7 +364,7 @@ public class AzureBlobFileSystemStore { client.getFileSystem(), path); - final AbfsRestOperation op = client.getPathProperties(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path), isNamespaceEnabled); + final AbfsRestOperation op = client.getPathStatus(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path)); final String resourceType = op.getResult().getResponseHeader(HttpHeaderConfigurations.X_MS_RESOURCE_TYPE); final long contentLength = Long.parseLong(op.getResult().getResponseHeader(HttpHeaderConfigurations.CONTENT_LENGTH)); @@ -392,7 +392,7 @@ public class AzureBlobFileSystemStore { path, overwrite); - final AbfsRestOperation op = client.getPathProperties(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path), isNamespaceEnabled); + final AbfsRestOperation op = client.getPathStatus(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path)); final String resourceType = op.getResult().getResponseHeader(HttpHeaderConfigurations.X_MS_RESOURCE_TYPE); final Long contentLength = Long.valueOf(op.getResult().getResponseHeader(HttpHeaderConfigurations.CONTENT_LENGTH)); @@ -468,7 +468,7 @@ public class AzureBlobFileSystemStore { ? client.getAclStatus(AbfsHttpConstants.FORWARD_SLASH + AbfsHttpConstants.ROOT_PATH) : client.getFilesystemProperties(); } else { - op = client.getPathProperties(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path), isNamespaceEnabled); + op = client.getPathStatus(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path)); } final long blockSize = abfsConfiguration.getAzureBlockSize(); diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java index 180870c042b..863ff548765 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java @@ -338,7 +338,7 @@ public class AbfsClient { return op; } - public AbfsRestOperation getPathProperties(final String path, boolean isNameSpaceEnabled) throws AzureBlobFileSystemException { + public AbfsRestOperation getPathStatus(final String path) throws AzureBlobFileSystemException { final List requestHeaders = createDefaultHeaders(); final AbfsUriQueryBuilder abfsUriQueryBuilder = createDefaultUriQueryBuilder(); @@ -346,7 +346,7 @@ public class AbfsClient { final URL url = createRequestUrl(path, abfsUriQueryBuilder.toString()); final AbfsRestOperation op = new AbfsRestOperation( - isNameSpaceEnabled ? AbfsRestOperationType.GetPathProperties : AbfsRestOperationType.GetPathStatus, + AbfsRestOperationType.GetPathStatus, this, HTTP_METHOD_HEAD, url, diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestFileSystemProperties.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestFileSystemProperties.java index e6b45c8f8b8..ba9b639adb6 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestFileSystemProperties.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestFileSystemProperties.java @@ -78,7 +78,7 @@ public class ITestFileSystemProperties extends AbstractAbfsIntegrationTest { touch(TEST_PATH); fs.getAbfsStore().setPathProperties(TEST_PATH, properties); Hashtable fetchedProperties = - fs.getAbfsStore().getPathProperties(TEST_PATH); + fs.getAbfsStore().getPathStatus(TEST_PATH); assertEquals(properties, fetchedProperties); } @@ -101,7 +101,7 @@ public class ITestFileSystemProperties extends AbstractAbfsIntegrationTest { properties.put("key", "{ value: valueTestå…© }"); touch(TEST_PATH); fs.getAbfsStore().setPathProperties(TEST_PATH, properties); - Hashtable fetchedProperties = fs.getAbfsStore().getPathProperties(TEST_PATH); + Hashtable fetchedProperties = fs.getAbfsStore().getPathStatus(TEST_PATH); assertEquals(properties, fetchedProperties); }