From 325163f23f727e82379d4a385b73aa3a04a510f6 Mon Sep 17 00:00:00 2001 From: Mingliang Liu Date: Fri, 9 Jun 2017 13:07:11 -0700 Subject: [PATCH] HADOOP-14512. WASB atomic rename should not throw exception if the file is neither in src nor in dst when doing the rename. Contributed by Duo Xu --- .../apache/hadoop/fs/azure/NativeAzureFileSystem.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 b2cc4eaf26..d605e81359 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 @@ -611,10 +611,12 @@ private void finishSingleFileRename(String fileName) // The rename already finished, so do nothing. ; } else { - throw new IOException( - "Attempting to complete rename of file " + srcKey + "/" + fileName - + " during folder rename redo, and file was not found in source " - + "or destination."); + // HADOOP-14512 + LOG.warn( + "Attempting to complete rename of file " + srcKey + "/" + fileName + + " during folder rename redo, and file was not found in source " + + "or destination " + dstKey + "/" + fileName + ". " + + "This must mean the rename of this file has already completed"); } }