Skip to content

Commit 313b5dc

Browse files
committed
Merge branch 'feat_1.10_impalaSinkKerberos_mergedTest4.0' into '1.10_test_4.0.x'
Feat 1.10 impala sink kerberos merged test4.0 See merge request dt-insight-engine/flinkStreamSQL!166
2 parents fa54ba3 + 8a10878 commit 313b5dc

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

core/src/test/java/com/dtstack/flink/sql/util/KrbUtilsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
**/
3131
public class KrbUtilsTest {
3232
@Test
33-
public void testGetUgi() throws IOException {
33+
public void testLoginAndReturnUgi() throws IOException {
3434
String principal = "";
3535
String keytabPath = "";
3636
String krb5confPath = "";
3737
try {
38-
KrbUtils.getUgi(principal, keytabPath, krb5confPath);
38+
KrbUtils.loginAndReturnUgi(principal, keytabPath, krb5confPath);
3939
} catch (IllegalArgumentException e) {
4040
Assert.assertEquals(e.getMessage(), "Can't get Kerberos realm");
4141
}

impala/impala-side/impala-all-side/src/main/java/com/dtstack/flink/sql/side/impala/ImpalaAllReqRow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public Connection getConn(String dbUrl, String userName, String password) {
7373
String keyTabFilePath = impalaSideTableInfo.getKeyTabFilePath();
7474
String krb5FilePath = impalaSideTableInfo.getKrb5FilePath();
7575
String principal = impalaSideTableInfo.getPrincipal();
76-
UserGroupInformation ugi = KrbUtils.getUgi(principal, keyTabFilePath, krb5FilePath);
76+
UserGroupInformation ugi = KrbUtils.loginAndReturnUgi(principal, keyTabFilePath, krb5FilePath);
7777
connection = ugi.doAs(new PrivilegedExceptionAction<Connection>() {
7878
@Override
7979
public Connection run() throws SQLException {

impala/impala-side/impala-async-side/src/main/java/com/dtstack/flink/sql/side/impala/ImpalaAsyncReqRow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void open(Configuration parameters) throws Exception {
7272
String keyTabFilePath = impalaSideTableInfo.getKeyTabFilePath();
7373
String krb5FilePath = impalaSideTableInfo.getKrb5FilePath();
7474
String principal = impalaSideTableInfo.getPrincipal();
75-
ugi = KrbUtils.getUgi(principal, keyTabFilePath, krb5FilePath);
75+
ugi = KrbUtils.loginAndReturnUgi(principal, keyTabFilePath, krb5FilePath);
7676
openJdbc(parameters);
7777
} else {
7878
openJdbc(parameters);

impala/impala-sink/src/main/java/com/dtstack/flink/sql/sink/impala/ImpalaOutputFormat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ private void initScheduledTask(Long batchWaitInterval) {
208208

209209
private void openConnect() throws IOException {
210210
if (authMech == 1) {
211-
UserGroupInformation ugi = KrbUtils.getUgi(principal, keytabPath, krb5confPath);
211+
UserGroupInformation ugi = KrbUtils.loginAndReturnUgi(principal, keytabPath, krb5confPath);
212212
try {
213213
ugi.doAs((PrivilegedExceptionAction<Void>) () -> {
214214
openJdbc();

0 commit comments

Comments
 (0)