diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 9008ead7c5f1f..a9b44e321c4f0 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -893,6 +893,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12119. hadoop fs -expunge does not work for federated namespace (J.Andreina via vinayakumarb) + HADOOP-12089. StorageException complaining " no lease ID" when updating + FolderLastModifiedTime in WASB. (Duo Xu via cnauroth) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES 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 623645a414d8a..a567b331a051b 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 @@ -1500,7 +1500,7 @@ public boolean delete(Path f, boolean recursive, createPermissionStatus(FsPermission.getDefault())); } else { if (!skipParentFolderLastModifidedTimeUpdate) { - store.updateFolderLastModifiedTime(parentKey, null); + updateParentFolderLastModifiedTime(key); } } } @@ -1561,9 +1561,8 @@ public boolean delete(Path f, boolean recursive, // Update parent directory last modified time Path parent = absolutePath.getParent(); if (parent != null && parent.getParent() != null) { // not root - String parentKey = pathToKey(parent); if (!skipParentFolderLastModifidedTimeUpdate) { - store.updateFolderLastModifiedTime(parentKey, null); + updateParentFolderLastModifiedTime(key); } } instrumentation.directoryDeleted();