You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2024/03/21 14:13:20 UTC
(doris) branch branch-2.1 updated: [fix](kerberos)fix hive keberos principal usage (#32612)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new f4c00535f43 [fix](kerberos)fix hive keberos principal usage (#32612)
f4c00535f43 is described below
commit f4c00535f4363ec06a46b74aaf70bb746295bf5c
Author: slothever <18...@users.noreply.github.com>
AuthorDate: Thu Mar 21 22:13:13 2024 +0800
[fix](kerberos)fix hive keberos principal usage (#32612)
from #32609
---
.../org/apache/doris/datasource/hive/HMSExternalCatalog.java | 4 ++--
.../doris/datasource/hive/HiveMetaStoreClientHelper.java | 11 +++--------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalCatalog.java
index 793a8a24228..0f2a7bb2acb 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalCatalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalCatalog.java
@@ -142,8 +142,8 @@ public class HMSExternalCatalog extends ExternalCatalog {
hiveConf.set(HiveConf.ConfVars.METASTORE_CLIENT_SOCKET_TIMEOUT.name(),
String.valueOf(Config.hive_metastore_client_timeout_second));
HadoopUGI.tryKrbLogin(this.getName(), AuthenticationConfig.getKerberosConfig(hiveConf,
- AuthenticationConfig.HIVE_KERBEROS_PRINCIPAL,
- AuthenticationConfig.HIVE_KERBEROS_KEYTAB));
+ AuthenticationConfig.HADOOP_KERBEROS_PRINCIPAL,
+ AuthenticationConfig.HADOOP_KERBEROS_KEYTAB));
}
metadataOps = ExternalMetadataOperations.newHiveMetadataOps(hiveConf, jdbcClientConfig, this);
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreClientHelper.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreClientHelper.java
index 23c83a11146..4cbad277d43 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreClientHelper.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreClientHelper.java
@@ -817,15 +817,10 @@ public class HiveMetaStoreClientHelper {
}
public static <T> T ugiDoAs(Configuration conf, PrivilegedExceptionAction<T> action) {
+ // if hive config is not ready, then use hadoop kerberos to login
AuthenticationConfig krbConfig = AuthenticationConfig.getKerberosConfig(conf,
- AuthenticationConfig.HIVE_KERBEROS_PRINCIPAL,
- AuthenticationConfig.HIVE_KERBEROS_KEYTAB);
- if (!krbConfig.isValid()) {
- // if hive config is not ready, then use hadoop kerberos to login
- krbConfig = AuthenticationConfig.getKerberosConfig(conf,
- AuthenticationConfig.HADOOP_KERBEROS_PRINCIPAL,
- AuthenticationConfig.HADOOP_KERBEROS_KEYTAB);
- }
+ AuthenticationConfig.HADOOP_KERBEROS_PRINCIPAL,
+ AuthenticationConfig.HADOOP_KERBEROS_KEYTAB);
return HadoopUGI.ugiDoAs(krbConfig, action);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org