[doris] 02/02: [fix](hdfs) not setting hadoop username when kerberos enabled (#18485)

[mo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git

commit 62eb6405e95f38569e2a2dd966a45e67588daf63
Author: Mingyu Chen <mo...@163.com>
AuthorDate: Mon Apr 10 09:32:27 2023 +0800

    [fix](hdfs) not setting hadoop username when kerberos enabled (#18485)
    
    1. If we set hadoop user property along with kerberos info, the authentication will fail.
    2. fix some minor issue of local fs, follow up #18397
    3. Add KW_HOSTNAME to keywords region, follow up #17329
    4. Fix tvf not working with pipeline engine, follow up #18376
---
 be/src/io/hdfs_builder.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/be/src/io/hdfs_builder.cpp b/be/src/io/hdfs_builder.cpp
index 2b482a3514..c82af8e299 100644
--- a/be/src/io/hdfs_builder.cpp
+++ b/be/src/io/hdfs_builder.cpp
@@ -93,10 +93,6 @@ THdfsParams parse_properties(const std::map<std::string, std::string>& propertie
 Status createHDFSBuilder(const THdfsParams& hdfsParams, HDFSCommonBuilder* builder) {
     RETURN_IF_ERROR(builder->init_hdfs_builder());
     hdfsBuilderSetNameNode(builder->get(), hdfsParams.fs_name.c_str());
-    // set hdfs user
-    if (hdfsParams.__isset.user) {
-        hdfsBuilderSetUserName(builder->get(), hdfsParams.user.c_str());
-    }
     // set kerberos conf
     if (hdfsParams.__isset.hdfs_kerberos_principal) {
         builder->need_kinit = true;
@@ -116,6 +112,9 @@ Status createHDFSBuilder(const THdfsParams& hdfsParams, HDFSCommonBuilder* build
 
     if (builder->is_need_kinit()) {
         RETURN_IF_ERROR(builder->run_kinit());
+    } else if (hdfsParams.__isset.user) {
+        // set hdfs user
+        hdfsBuilderSetUserName(builder->get(), hdfsParams.user.c_str());
     }
 
     return Status::OK();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org