From 33ae4524ce87ccc43e8f6c8583fc3ef3f90a8734 Mon Sep 17 00:00:00 2001 From: slothever <18522955+wsjz@users.noreply.github.com> Date: Thu, 6 Apr 2023 16:35:24 +0800 Subject: [PATCH] [fix](multi-catalog) Fix properties check in S3Storage and add hive socket timeout config (#18420) Co-authored-by: jinzhe --- fe/fe-core/src/main/java/org/apache/doris/backup/S3Storage.java | 2 +- .../java/org/apache/doris/datasource/HMSExternalCatalog.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/S3Storage.java b/fe/fe-core/src/main/java/org/apache/doris/backup/S3Storage.java index 0caa727c90..76470b2e41 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/backup/S3Storage.java +++ b/fe/fe-core/src/main/java/org/apache/doris/backup/S3Storage.java @@ -103,7 +103,7 @@ public class S3Storage extends BlobStorage { S3Properties.convertToStdProperties(caseInsensitiveProperties); } try { - S3Properties.requiredS3Properties(properties); + S3Properties.requiredS3Properties(caseInsensitiveProperties); } catch (DdlException e) { throw new IllegalArgumentException(e); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java index c4832fd683..449ac0bfd6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java @@ -163,6 +163,8 @@ public class HMSExternalCatalog extends ExternalCatalog { for (Map.Entry kv : catalogProperty.getHadoopProperties().entrySet()) { hiveConf.set(kv.getKey(), kv.getValue()); } + hiveConf.set(HiveConf.ConfVars.METASTORE_CLIENT_SOCKET_TIMEOUT.name(), + String.valueOf(Config.hive_metastore_client_timeout_second)); String authentication = catalogProperty.getOrDefault( HdfsResource.HADOOP_SECURITY_AUTHENTICATION, ""); if (AuthType.KERBEROS.getDesc().equals(authentication)) {