Repository: hadoop Updated Branches: refs/heads/branch-2.8 3f23d50c9 -> ff706261b
HADOOP-14048. REDO operation of WASB#AtomicRename should create placeholder blob for destination folder. Contributed by NITIN VERMA (cherry picked from commit c571cda5c7d929477961dfff4176d7de4944d874) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ff706261 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ff706261 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ff706261 Branch: refs/heads/branch-2.8 Commit: ff706261bed2f3624bc7f471fc39ba0bb96aa6eb Parents: 3f23d50 Author: Mingliang Liu <[email protected]> Authored: Mon Mar 6 16:53:30 2017 -0800 Committer: Mingliang Liu <[email protected]> Committed: Mon Mar 6 17:01:26 2017 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/fs/azure/NativeAzureFileSystem.java | 10 ++++++++++ 1 file changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff706261/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 a832143..e60be38 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 @@ -537,6 +537,16 @@ public class NativeAzureFileSystem extends FileSystem { // Remove the source folder. Don't check explicitly if it exists, // to avoid triggering redo recursively. try { + // Rename the source folder 0-byte root file + // as destination folder 0-byte root file. + FileMetadata srcMetaData = this.getSourceMetadata(); + if (srcMetaData.getBlobMaterialization() == BlobMaterialization.Explicit) { + // We already have a lease. So let's just rename the source blob + // as destination blob under same lease. + fs.getStoreInterface().rename(this.getSrcKey(), this.getDstKey(), false, lease); + } + + // Now we can safely delete the source folder. fs.getStoreInterface().delete(srcKey, lease); } catch (Exception e) { LOG.info("Unable to delete source folder during folder rename redo. " --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
