Fix the issue of Spark Job submission on wasbs storage

Signed-off-by: Wei Zhang <[email protected]>

Author: wezhang

Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/cluster/ClusterDetail.java

@@ -47,7 +47,7 @@ public class ClusterDetail implements IClusterDetail {
     private final String DefaultFS = "fs.defaultFS";
     private final String FSDefaultName = "fs.default.name";
     private final String StorageAccountKeyPrefix = "fs.azure.account.key.";
-    private final String StorageAccountNamePattern = "^wasb://(.*)@(.*)$";
+    private final String StorageAccountNamePattern = "^wasb[s]?://(.*)@(.*)$";
     private final String ResourceGroupStartTag = "resourceGroups/";
     private final String ResourceGroupEndTag = "/providers/";
 

Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/spark/jobs/JobUtils.java

@@ -413,7 +413,7 @@ public static String uploadFileToAzure(@NotNull File file,
                     }
 
                     String path = String.format("SparkSubmission/%s/%s", uploadFolderPath, file.getName());
-                    String uploadedPath = String.format("wasb://%s@%s/%s", defaultContainerName, blobStorageAccount.getFullStorageBlobName(), path);
+                    String uploadedPath = String.format("wasbs://%s@%s/%s", defaultContainerName, blobStorageAccount.getFullStorageBlobName(), path);
 
                     logSubject.onNext(new SimpleImmutableEntry<>(Info,
                             String.format("Begin uploading file %s to Azure Blob Storage Account %s ...",