Skip to content

Commit 78df246

Browse files
authored
[Fix-7375][datasource] remove excess hive jdbc principal (#7375) (#7382)
1 parent 54a89e9 commit 78df246

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

Diff for: dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,9 @@ public void buildParameter() {
328328
hiveDataSourceParamDTO.setLoginUserKeytabPath("/opt/hdfs.headless.keytab");
329329
hiveDataSourceParamDTO.setLoginUserKeytabUsername("test2/[email protected]");
330330
connectionParam = DatasourceUtil.buildConnectionParams(hiveDataSourceParamDTO);
331-
expected = "{\"user\":\"test\",\"password\":\"test\",\"address\":\"jdbc:hive2://192.168.9.1:10000\",\"database\":\"im\",\"jdbcUrl\":\"jdbc:hive2://192.168.9.1:10000/im;"
332-
+ "principal=hive/[email protected]\",\"driverClassName\":\"org.apache.hive.jdbc.HiveDriver\",\"validationQuery\":\"select 1\",\"principal\":\"hive/[email protected]\","
331+
332+
expected = "{\"user\":\"test\",\"password\":\"test\",\"address\":\"jdbc:hive2://192.168.9.1:10000\",\"database\":\"im\",\"jdbcUrl\":\"jdbc:hive2://192.168.9.1:10000/im\","
333+
+ "\"driverClassName\":\"org.apache.hive.jdbc.HiveDriver\",\"validationQuery\":\"select 1\",\"principal\":\"hive/[email protected]\","
333334
+ "\"javaSecurityKrb5Conf\":\"/opt/krb5.conf\",\"loginUserKeytabUsername\":\"test2/[email protected]\",\"loginUserKeytabPath\":\"/opt/hdfs.headless.keytab\"}";
334335
Assert.assertEquals(expected, JSONUtils.toJsonString(connectionParam));
335336

Diff for: dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/hive/HiveDatasourceProcessor.java

-3
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ public BaseConnectionParam createConnectionParams(BaseDataSourceParamDTO datasou
7474
}
7575
address.deleteCharAt(address.length() - 1);
7676
String jdbcUrl = address.toString() + "/" + hiveParam.getDatabase();
77-
if (CommonUtils.getKerberosStartupState()) {
78-
jdbcUrl += ";principal=" + hiveParam.getPrincipal();
79-
}
8077

8178
HiveConnectionParam hiveConnectionParam = new HiveConnectionParam();
8279
hiveConnectionParam.setDatabase(hiveParam.getDatabase());

Diff for: dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/spark/SparkDatasourceProcessor.java

-3
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@ public BaseConnectionParam createConnectionParams(BaseDataSourceParamDTO dataSou
7777
address.deleteCharAt(address.length() - 1);
7878

7979
String jdbcUrl = address + "/" + sparkDatasourceParam.getDatabase();
80-
if (CommonUtils.getKerberosStartupState()) {
81-
jdbcUrl += ";principal=" + sparkDatasourceParam.getPrincipal();
82-
}
8380

8481
SparkConnectionParam sparkConnectionParam = new SparkConnectionParam();
8582
sparkConnectionParam.setPassword(PasswordUtils.encodePassword(sparkDatasourceParam.getPassword()));

0 commit comments

Comments
 (0)