[dolphinscheduler] branch 2.0.2-prepare updated: fix bug #7375 (#7388)

[zhongjiajie]

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

zhongjiajie pushed a commit to branch 2.0.2-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/2.0.2-prepare by this push:
     new 3aa939e  fix bug #7375 (#7388)
3aa939e is described below

commit 3aa939eaa9d0378e32efc40b9a83d19fe238ee89
Author: ouyangyewei <ouyangye...@foxmail.com>
AuthorDate: Tue Dec 14 10:35:38 2021 +0800

    fix bug #7375 (#7388)
    
    Co-authored-by: ouyangyewei <yewei.o...@alibaba-inc.com>
---
 .../apache/dolphinscheduler/api/service/DataSourceServiceTest.java   | 5 +++--
 .../datasource/api/datasource/hive/HiveDatasourceProcessor.java      | 3 ---
 .../datasource/api/datasource/spark/SparkDatasourceProcessor.java    | 3 ---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git 
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
 
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
index d29b6be..68d02c2 100644
--- 
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
+++ 
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
@@ -328,8 +328,9 @@ public class DataSourceServiceTest {
         
hiveDataSourceParamDTO.setLoginUserKeytabPath("/opt/hdfs.headless.keytab");
         
hiveDataSourceParamDTO.setLoginUserKeytabUsername("test2/hdfs-myclus...@esz.com");
         connectionParam = 
DatasourceUtil.buildConnectionParams(hiveDataSourceParamDTO);
-        expected = 
"{\"user\":\"test\",\"password\":\"test\",\"address\":\"jdbc:hive2://192.168.9.1:10000\",\"database\":\"im\",\"jdbcUrl\":\"jdbc:hive2://192.168.9.1:10000/im;"
-                + 
"principal=hive/hdfs-myclus...@esz.com\",\"driverClassName\":\"org.apache.hive.jdbc.HiveDriver\",\"validationQuery\":\"select
 1\",\"principal\":\"hive/hdfs-myclus...@esz.com\","
+
+        expected = 
"{\"user\":\"test\",\"password\":\"test\",\"address\":\"jdbc:hive2://192.168.9.1:10000\",\"database\":\"im\",\"jdbcUrl\":\"jdbc:hive2://192.168.9.1:10000/im\","
+                + 
"\"driverClassName\":\"org.apache.hive.jdbc.HiveDriver\",\"validationQuery\":\"select
 1\",\"principal\":\"hive/hdfs-myclus...@esz.com\","
                 + 
"\"javaSecurityKrb5Conf\":\"/opt/krb5.conf\",\"loginUserKeytabUsername\":\"test2/hdfs-myclus...@esz.com\",\"loginUserKeytabPath\":\"/opt/hdfs.headless.keytab\"}";
         Assert.assertEquals(expected, JSONUtils.toJsonString(connectionParam));
 
diff --git 
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/hive/HiveDatasourceProcessor.java
 
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/hive/HiveDatasourceProcessor.java
index 2f7c7af..15e2ad2 100644
--- 
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/hive/HiveDatasourceProcessor.java
+++ 
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/hive/HiveDatasourceProcessor.java
@@ -74,9 +74,6 @@ public class HiveDatasourceProcessor extends 
AbstractDatasourceProcessor {
         }
         address.deleteCharAt(address.length() - 1);
         String jdbcUrl = address.toString() + "/" + hiveParam.getDatabase();
-        if (CommonUtils.getKerberosStartupState()) {
-            jdbcUrl += ";principal=" + hiveParam.getPrincipal();
-        }
 
         HiveConnectionParam hiveConnectionParam = new HiveConnectionParam();
         hiveConnectionParam.setDatabase(hiveParam.getDatabase());
diff --git 
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/spark/SparkDatasourceProcessor.java
 
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/spark/SparkDatasourceProcessor.java
index 376399d..bb930d7 100644
--- 
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/spark/SparkDatasourceProcessor.java
+++ 
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/spark/SparkDatasourceProcessor.java
@@ -77,9 +77,6 @@ public class SparkDatasourceProcessor extends 
AbstractDatasourceProcessor {
         address.deleteCharAt(address.length() - 1);
 
         String jdbcUrl = address + "/" + sparkDatasourceParam.getDatabase();
-        if (CommonUtils.getKerberosStartupState()) {
-            jdbcUrl += ";principal=" + sparkDatasourceParam.getPrincipal();
-        }
 
         SparkConnectionParam sparkConnectionParam = new SparkConnectionParam();
         
sparkConnectionParam.setPassword(PasswordUtils.encodePassword(sparkDatasourceParam.getPassword()));