big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-12089. StorageException complaining " no lease ID" when updating FolderLastModifiedTime in WASB. Contributed by Duo Xu.

Browse Source
This commit is contained in:
cnauroth 2015-06-29 13:48:02 -07:00
parent 62e583c7dc
commit 460e98f7b3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -893,6 +893,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12119. hadoop fs -expunge does not work for federated namespace HADOOP-12119. hadoop fs -expunge does not work for federated namespace
(J.Andreina via vinayakumarb) (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 Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java
View File

@ -1500,7 +1500,7 @@ public boolean delete(Path f, boolean recursive,
createPermissionStatus(FsPermission.getDefault())); createPermissionStatus(FsPermission.getDefault()));
} else { } else {
if (!skipParentFolderLastModifidedTimeUpdate) { 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 // Update parent directory last modified time
Path parent = absolutePath.getParent(); Path parent = absolutePath.getParent();
if (parent != null && parent.getParent() != null) { // not root if (parent != null && parent.getParent() != null) { // not root
String parentKey = pathToKey(parent);
if (!skipParentFolderLastModifidedTimeUpdate) { if (!skipParentFolderLastModifidedTimeUpdate) {
store.updateFolderLastModifiedTime(parentKey, null); updateParentFolderLastModifiedTime(key);
} }
} }
instrumentation.directoryDeleted(); instrumentation.directoryDeleted();