From b2ae956a314bc414747ec4beb09171375069dc23 Mon Sep 17 00:00:00 2001
From: lixiangqian1 <lixiangqian3@jd.com>
Date: Tue, 31 Mar 2020 23:08:36 +0800
Subject: [PATCH 1/3] make 'username' valid in broker load

---
 .../doris/broker/hdfs/FileSystemManager.java  | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/FileSystemManager.java b/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/FileSystemManager.java
index e80134078953bd..e7270ee0b43d76 100644
--- a/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/FileSystemManager.java
+++ b/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/FileSystemManager.java
@@ -46,6 +46,7 @@
 import java.nio.ByteBuffer;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
@@ -246,9 +247,7 @@ public BrokerFileSystem getDistributedFileSystem(String path, Map<String, String
                 // TODO get this param from properties
                 // conf.set("dfs.replication", "2");
                 String tmpFilePath = null;
-                if (authentication.equals(AUTHENTICATION_SIMPLE)) {
-                    conf.set(HDFS_UGI_CONF, hdfsUgi);
-                } else if (authentication.equals(AUTHENTICATION_KERBEROS)){
+                if (authentication.equals(AUTHENTICATION_KERBEROS)){
                     conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
                             AUTHENTICATION_KERBEROS);
 
@@ -287,7 +286,7 @@ public BrokerFileSystem getDistributedFileSystem(String path, Map<String, String
                                     e.getMessage());
                         }
                     }
-                } else {
+                } else if (!authentication.equals(AUTHENTICATION_SIMPLE)) {
                     throw  new BrokerException(TBrokerOperationStatusCode.INVALID_ARGUMENT,
                             "invalid authentication.");
                 }
@@ -338,7 +337,20 @@ public BrokerFileSystem getDistributedFileSystem(String path, Map<String, String
                 }
 
                 conf.set(FS_HDFS_IMPL_DISABLE_CACHE, "true");
-                FileSystem dfsFileSystem = FileSystem.get(pathUri.getUri(), conf);
+                FileSystem dfsFileSystem = null;
+                if (authentication.equals(AUTHENTICATION_SIMPLE) &&
+                    properties.containsKey(USER_NAME_KEY)) {
+                    // Use the specified 'username' as the login name
+                    UserGroupInformation ugi = UserGroupInformation.createRemoteUser(username);
+                    dfsFileSystem = ugi.doAs(new PrivilegedExceptionAction<FileSystem>() {
+                        @Override
+                        public FileSystem run() throws Exception {
+                            return FileSystem.get(pathUri.getUri(), conf);
+                        }
+                    });
+                } else {
+                    dfsFileSystem = FileSystem.get(pathUri.getUri(), conf);
+                }
                 fileSystem.setFileSystem(dfsFileSystem);
             }
             return fileSystem;

From f448aac12710885808e684b4f85781d1d72c1cdb Mon Sep 17 00:00:00 2001
From: lixiangqian1 <lixiangqian3@jd.com>
Date: Wed, 1 Apr 2020 10:37:42 +0800
Subject: [PATCH 2/3] delete 'hadoop.job.ugi'

---
 .../java/org/apache/doris/broker/hdfs/FileSystemManager.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/FileSystemManager.java b/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/FileSystemManager.java
index e7270ee0b43d76..e9039889312a3d 100644
--- a/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/FileSystemManager.java
+++ b/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/FileSystemManager.java
@@ -66,7 +66,6 @@ public class FileSystemManager {
     private static final String HDFS_SCHEME = "hdfs";
     private static final String S3A_SCHEME = "s3a";
 
-    private static final String HDFS_UGI_CONF = "hadoop.job.ugi";
     private static final String USER_NAME_KEY = "username";
     private static final String PASSWORD_KEY = "password";
     private static final String AUTHENTICATION_SIMPLE = "simple";

From 40d62189505c82b0d3a22380b220ec7519ddff5c Mon Sep 17 00:00:00 2001
From: lixiangqian1 <lixiangqian3@jd.com>
Date: Wed, 1 Apr 2020 10:58:47 +0800
Subject: [PATCH 3/3] delete redundant code

---
 .../java/org/apache/doris/broker/hdfs/FileSystemManager.java   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/FileSystemManager.java b/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/FileSystemManager.java
index e9039889312a3d..1d377b1c41a643 100644
--- a/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/FileSystemManager.java
+++ b/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/FileSystemManager.java
@@ -285,9 +285,6 @@ public BrokerFileSystem getDistributedFileSystem(String path, Map<String, String
                                     e.getMessage());
                         }
                     }
-                } else if (!authentication.equals(AUTHENTICATION_SIMPLE)) {
-                    throw  new BrokerException(TBrokerOperationStatusCode.INVALID_ARGUMENT,
-                            "invalid authentication.");
                 }
                 if (!Strings.isNullOrEmpty(dfsNameServices)) {
                     // ha hdfs arguments