[fix](azure) let backup to azure work and use https for azure

dataroaring · Dec 26, 2024 · a586fd5 · a586fd5
1 parent ac385e5
commit a586fd5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageBackend.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageBackend.java
@@ -152,6 +152,7 @@ public enum StorageType {
         GFS("Tencent Goose File System"),
         JFS("Juicefs"),
         STREAM("Stream load pipe"),
+        // decrepated
         AZURE("MicroSoft Azure Blob");
 
         @SerializedName("desc")

diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/S3ClientBEProperties.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/S3ClientBEProperties.java
@@ -85,6 +85,10 @@ private static Map<String, String> getBeAWSPropertiesFromS3(Map<String, String>
         if (properties.containsKey(PropertyConverter.USE_PATH_STYLE)) {
             beProperties.put(PropertyConverter.USE_PATH_STYLE, properties.get(PropertyConverter.USE_PATH_STYLE));
         }
+        if (properties.containsKey(S3Properties.PROVIDER)) {
+            beProperties.put(S3Properties.PROVIDER, properties.get(S3Properties.PROVIDER));
+        }
+
         return beProperties;
     }
 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/fs/remote/AzureFileSystem.java b/fe/fe-core/src/main/java/org/apache/doris/fs/remote/AzureFileSystem.java
@@ -17,7 +17,6 @@
 
 package org.apache.doris.fs.remote;
 
-import org.apache.doris.analysis.StorageBackend;
 import org.apache.doris.analysis.StorageBackend.StorageType;
 import org.apache.doris.backup.Status;
 import org.apache.doris.common.UserException;
@@ -35,13 +34,13 @@ public class AzureFileSystem extends ObjFileSystem {
     private static final Logger LOG = LogManager.getLogger(AzureFileSystem.class);
 
     public AzureFileSystem(Map<String, String> properties) {
-        super(StorageType.AZURE.name(), StorageType.AZURE, new AzureObjStorage(properties));
+        super(StorageType.AZURE.name(), StorageType.S3, new AzureObjStorage(properties));
         initFsProperties();
     }
 
     @VisibleForTesting
     public AzureFileSystem(AzureObjStorage storage) {
-        super(StorageBackend.StorageType.AZURE.name(), StorageBackend.StorageType.AZURE, storage);
+        super(StorageType.AZURE.name(), StorageType.S3, storage);
         initFsProperties();
     }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/gson/GsonUtils.java b/fe/fe-core/src/main/java/org/apache/doris/persist/gson/GsonUtils.java
@@ -172,6 +172,7 @@
 import org.apache.doris.datasource.trinoconnector.TrinoConnectorExternalDatabase;
 import org.apache.doris.datasource.trinoconnector.TrinoConnectorExternalTable;
 import org.apache.doris.fs.PersistentFileSystem;
+import org.apache.doris.fs.remote.AzureFileSystem;
 import org.apache.doris.fs.remote.BrokerFileSystem;
 import org.apache.doris.fs.remote.ObjFileSystem;
 import org.apache.doris.fs.remote.S3FileSystem;
@@ -566,7 +567,8 @@ public class GsonUtils {
             .registerSubtype(JFSFileSystem.class, JFSFileSystem.class.getSimpleName())
             .registerSubtype(OFSFileSystem.class, OFSFileSystem.class.getSimpleName())
             .registerSubtype(ObjFileSystem.class, ObjFileSystem.class.getSimpleName())
-            .registerSubtype(S3FileSystem.class, S3FileSystem.class.getSimpleName());
+            .registerSubtype(S3FileSystem.class, S3FileSystem.class.getSimpleName())
+            .registerSubtype(AzureFileSystem.class, AzureFileSystem.class.getSimpleName());
 
     private static RuntimeTypeAdapterFactory<org.apache.doris.backup.AbstractJob>
             jobBackupTypeAdapterFactory