branch-3.1: [improve](glue)Refine Glue region and endpoint initialization #57365 (#57479)

Cherry-picked from #57365

Co-authored-by: Calvin Kirs <[email protected]>

Author: github-actions[bot]

fe/fe-core/src/main/java/org/apache/doris/backup/Repository.java

@@ -30,6 +30,7 @@
 import org.apache.doris.common.io.Writable;
 import org.apache.doris.common.util.PrintableMap;
 import org.apache.doris.common.util.TimeUtils;
+import org.apache.doris.datasource.property.storage.BrokerProperties;
 import org.apache.doris.datasource.property.storage.StorageProperties;
 import org.apache.doris.fs.FileSystemFactory;
 import org.apache.doris.fs.PersistentFileSystem;
@@ -211,14 +212,15 @@ public void gsonPostProcess() {
             StorageProperties storageProperties = StorageProperties.createPrimary(this.fileSystem.properties);
             this.fileSystem = FileSystemFactory.get(storageProperties);
         } catch (RuntimeException exception) {
-            LOG.warn("Failed to create file system from properties, error msg {}",
+            LOG.warn("File system initialization failed due to incompatible configuration parameters. "
+                            + "The system has reverted to BrokerFileSystem as a fallback. "
+                            + "However, the current configuration is not supported by this version and"
+                            + " cannot be used as is. "
+                            + "Please review the configuration and update it to match the supported parameter"
+                            + " format. Root cause: {}",
                     ExceptionUtils.getRootCause(exception), exception);
-            throw new IllegalStateException(
-                    "Failed to initialize file system due to incompatible configuration with the current version. "
-                            + "This may be caused by a change in property formats or deprecated settings. "
-                            + "Please verify your configuration and ensure it matches the "
-                            + "new version requirements. error msg: "
-                            + ExceptionUtils.getRootCause(exception), exception);
+            BrokerProperties brokerProperties = BrokerProperties.of(this.fileSystem.name, this.fileSystem.properties);
+            this.fileSystem = FileSystemFactory.get(brokerProperties);
         }
     }
 

fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/AWSGlueMetaStoreBaseProperties.java

@@ -95,7 +95,7 @@ public static AWSGlueMetaStoreBaseProperties of(Map<String, String> properties)
     private ParamRules buildRules() {
 
         return new ParamRules().requireTogether(new String[]{glueAccessKey, glueSecretKey},
-                "glue.access_key and glue.secret_key must be set together")
+                        "glue.access_key and glue.secret_key must be set together")
                 .requireAtLeastOne(new String[]{glueAccessKey, glueIAMRole},
                         "At least one of glue.access_key or glue.role_arn must be set")
                 .requireAtLeastOne(new String[]{glueEndpoint, glueRegion},
@@ -104,14 +104,20 @@ private ParamRules buildRules() {
 
     private void checkAndInit() {
         buildRules().validate();
-
+        if (StringUtils.isNotBlank(glueRegion) && StringUtils.isNotBlank(glueEndpoint)) {
+            return;
+        }
+        if (StringUtils.isBlank(glueEndpoint) && StringUtils.isNotBlank(glueRegion)) {
+            return;
+        }
+        // glue region is not set, try to extract from endpoint
         Matcher matcher = ENDPOINT_PATTERN.matcher(glueEndpoint.toLowerCase());
-        if (!matcher.matches()) {
-            throw new IllegalArgumentException("Invalid AWS Glue endpoint: " + glueEndpoint);
+        if (matcher.matches()) {
+            this.glueRegion = extractRegionFromEndpoint(matcher);
         }
-
         if (StringUtils.isBlank(glueRegion)) {
-            this.glueRegion = extractRegionFromEndpoint(matcher);
+            //follow aws sdk default region
+            glueRegion = "us-east-1";
         }
     }
 

fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/AWSGlueMetaStoreBasePropertiesTest.java

@@ -42,6 +42,20 @@ void testValidPropertiesWithRegionFromEndpoint() {
         Assertions.assertEquals("us-east-1", glueProps.glueRegion);
     }
 
+    @Test
+    void testValidPropertiesWithRegion() {
+        Map<String, String> props = baseValidProps();
+        props.put("glue.region", "us-east-1");
+        props.put("glue.endpoint", "https://glue.us-east-1.amazonaws.com.cn");
+        AWSGlueMetaStoreBaseProperties glueProps = AWSGlueMetaStoreBaseProperties.of(props);
+        Assertions.assertTrue("https://glue.us-east-1.amazonaws.com.cn".equals(glueProps.glueEndpoint));
+        Assertions.assertEquals("us-east-1", glueProps.glueRegion);
+        props.remove("glue.region");
+        glueProps = AWSGlueMetaStoreBaseProperties.of(props);
+        Assertions.assertTrue("https://glue.us-east-1.amazonaws.com.cn".equals(glueProps.glueEndpoint));
+        Assertions.assertEquals("us-east-1", glueProps.glueRegion);
+    }
+
     @Test
     void testValidPropertiesWithExplicitRegion() {
         Map<String, String> props = baseValidProps();
@@ -86,27 +100,18 @@ void testMissingEndpointThrows() {
     }
 
     @Test
-    void testInvalidEndpointThrows() {
+    void testInvalidEndpoint() {
         Map<String, String> props = baseValidProps();
         props.put("glue.endpoint", "http://invalid-endpoint.com");
-
-        IllegalArgumentException ex = Assertions.assertThrows(
-                IllegalArgumentException.class,
-                () -> AWSGlueMetaStoreBaseProperties.of(props)
-        );
-        Assertions.assertTrue(ex.getMessage().contains("Invalid AWS Glue endpoint"));
+        Assertions.assertDoesNotThrow(() -> AWSGlueMetaStoreBaseProperties.of(props));
     }
 
     @Test
     void testExtractRegionFailsWhenPatternMatchesButNoRegion() {
         Map<String, String> props = baseValidProps();
         props.put("glue.endpoint", "glue..amazonaws.com"); // malformed
-
-        IllegalArgumentException ex = Assertions.assertThrows(
-                IllegalArgumentException.class,
-                () -> AWSGlueMetaStoreBaseProperties.of(props)
+        Assertions.assertDoesNotThrow(() -> AWSGlueMetaStoreBaseProperties.of(props)
         );
-        Assertions.assertTrue(ex.getMessage().contains("Invalid AWS Glue endpoint"));
     }
 
     @Test