Repository: hadoop Updated Branches: refs/heads/branch-2 930e344d7 -> bb080b32d refs/heads/trunk 402532628 -> efa97243e
HADOOP-12239. StorageException complaining " no lease ID" when updating FolderLastModifiedTime in WASB. Contributed by Duo Xu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/efa97243 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/efa97243 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/efa97243 Branch: refs/heads/trunk Commit: efa97243ecb84b3b468e732897cd685e3869f480 Parents: 4025326 Author: cnauroth <[email protected]> Authored: Wed Jul 22 11:16:49 2015 -0700 Committer: cnauroth <[email protected]> Committed: Wed Jul 22 11:16:49 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../org/apache/hadoop/fs/azure/NativeAzureFileSystem.java | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/efa97243/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 3d101d4..c0e5c92 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -995,6 +995,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12017. Hadoop archives command should use configurable replication factor when closing (Bibin A Chundatt via vinayakumarb) + HADOOP-12239. StorageException complaining " no lease ID" when updating + FolderLastModifiedTime in WASB. (Duo Xu via cnauroth) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/efa97243/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java index a567b33..bb9941b 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java @@ -1360,8 +1360,12 @@ public class NativeAzureFileSystem extends FileSystem { String parentKey = pathToKey(parentFolder); FileMetadata parentMetadata = store.retrieveMetadata(parentKey); if (parentMetadata != null && parentMetadata.isDir() && - parentMetadata.getBlobMaterialization() == BlobMaterialization.Explicit) { - store.updateFolderLastModifiedTime(parentKey, parentFolderLease); + parentMetadata.getBlobMaterialization() == BlobMaterialization.Explicit) { + if (parentFolderLease != null) { + store.updateFolderLastModifiedTime(parentKey, parentFolderLease); + } else { + updateParentFolderLastModifiedTime(key); + } } else { // Make sure that the parent folder exists. // Create it using inherited permissions from the first existing directory going up the path
