Kaynağa Gözat

HADOOP-15506. Upgrade Azure Storage Sdk version to 7.0.0 and update corresponding code blocks.
Contributed by Esfandiar Manii.

(cherry picked from commit d901be679554eb6b323f3bc6e8de267d85dd2e06)
(cherry picked from commit baac7c2b285454d71d0371505fb7a3403a548176)

Steve Loughran 7 yıl önce
ebeveyn
işleme
df338f2e1a

+ 1 - 1
hadoop-project/pom.xml

@@ -1161,7 +1161,7 @@
       <dependency>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-storage</artifactId>
-        <version>5.4.0</version>
+        <version>7.0.0</version>
      </dependency>
 
       <dependency>

+ 3 - 1
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystemHelper.java

@@ -87,8 +87,10 @@ final class NativeAzureFileSystemHelper {
     if (errorCode != null
         && (errorCode.equals(StorageErrorCodeStrings.BLOB_NOT_FOUND)
             || errorCode.equals(StorageErrorCodeStrings.RESOURCE_NOT_FOUND)
+            || errorCode.equals(StorageErrorCodeStrings.CONTAINER_NOT_FOUND)
             || errorCode.equals(StorageErrorCode.BLOB_NOT_FOUND.toString())
-            || errorCode.equals(StorageErrorCode.RESOURCE_NOT_FOUND.toString()))) {
+            || errorCode.equals(StorageErrorCode.RESOURCE_NOT_FOUND.toString())
+            || errorCode.equals(StorageErrorCode.CONTAINER_NOT_FOUND.toString()))) {
 
       return true;
     }

+ 6 - 3
hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/ITestContainerChecks.java

@@ -75,7 +75,7 @@ public class ITestContainerChecks extends AbstractWasbTestWithTimeout {
       assertTrue("Should've thrown.", false);
     } catch (FileNotFoundException ex) {
       assertTrue("Unexpected exception: " + ex,
-          ex.getMessage().contains("does not exist."));
+          ex.getMessage().contains("is not found"));
     }
     assertFalse(container.exists());
 
@@ -115,7 +115,7 @@ public class ITestContainerChecks extends AbstractWasbTestWithTimeout {
       assertTrue("Should've thrown.", false);
     } catch (FileNotFoundException ex) {
       assertTrue("Unexpected exception: " + ex,
-          ex.getMessage().contains("does not exist."));
+          ex.getMessage().contains("is not found"));
     }
     assertFalse(container.exists());
 
@@ -143,7 +143,7 @@ public class ITestContainerChecks extends AbstractWasbTestWithTimeout {
       assertTrue("Should've thrown.", false);
     } catch (FileNotFoundException ex) {
       assertTrue("Unexpected exception: " + ex,
-          ex.getMessage().contains("does not exist."));
+          ex.getMessage().contains("is not found"));
     }
     assertFalse(container.exists());
 
@@ -165,6 +165,9 @@ public class ITestContainerChecks extends AbstractWasbTestWithTimeout {
     assertFalse(fs.rename(foo, bar));
     assertFalse(container.exists());
 
+    // Create a container outside of the WASB FileSystem
+    container.create();
+
     // But a write should.
     assertTrue(fs.createNewFile(foo));
     assertTrue(container.exists());