apache/kyuubi
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

[KYUUBI #1008][FOLLOWUP] No need to send private token from Kyuubi server to engine

Browse Source 
### _Why are the changes needed?_
When communicating with NameNode HA, private tokens are created from original token:
![image](https://user-images.githubusercontent.com/88070094/135081188-5311d161-eb74-4be7-bd6f-b595c512f575.png)
In above image, "ha-hdfs:mycluster" is the original token. "ha-hdfs://192.168.56.101:8020" and "ha-hdfs://192.168.56.102:8020" are private tokens.

`KyuubiHadoopUtils.getCredentialsInternal` was supposed to extract these private tokens at Kyuubi server side and send them to SQL engine.

But in fact, SQL engine side private tokens are automatically created when adding original token,
 inside `org.apache.hadoop.security.Credentials#addToken`.

### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible

- [x] Add screenshots for manual tests if appropriate
SequenceNumber of private tokens always equal to original token:
![image](https://user-images.githubusercontent.com/88070094/135083412-5e5f3821-b4bc-4b20-a702-e2455c60044e.png)
![image](https://user-images.githubusercontent.com/88070094/135083421-654a0e62-9f85-47a0-b136-ee6ad7c32a05.png)

- [x] [Run test](https://kyuubi.readthedocs.io/en/latest/develop_tools/testing.html#running-tests) locally before make a pull request

Closes #1173 from zhouyifan279/#1008.

Closes #1008

891dc2b6 [zhouyifan279] [KYUUBI #1008][FOLLOWUP] No need to send private token from Kyuubi server to engine

Authored-by: zhouyifan279 <zhouyifan279@gmail.com>
Signed-off-by: Kent Yao <yao@apache.org>
This commit is contained in:
zhouyifan279 2021-10-08 10:32:51 +08:00 committed by Kent Yao
parent d332534325
commit d44ccc3644
No known key found for this signature in database
GPG Key ID: F7051850A0AF904D
3 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkThriftBinaryFrontendService.scala vendored
View File

@ -48,7 +48,7 @@ class SparkThriftBinaryFrontendService(
KyuubiHadoopUtils.getTokenMap(newCreds).partition(_._2.getKind == HIVE_DELEGATION_TOKEN)
val updateCreds = new Credentials()
val oldCreds = KyuubiHadoopUtils.getCredentialsInternal(UserGroupInformation.getCurrentUser)
val oldCreds = UserGroupInformation.getCurrentUser.getCredentials
addHiveToken(hiveTokens, oldCreds, updateCreds)
addOtherTokens(otherTokens, oldCreds, updateCreds)
if (updateCreds.numberOfTokens() > 0) {

9
externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/operation/SparkOperationSuite.scala vendored
View File

@ -806,8 +806,7 @@ class SparkOperationSuite extends WithSparkSQLEngine with HiveJDBCTests {
creds2.addToken(new Text("HDFS2"), extraHDFSToken)
sendCredentials(client, creds2)
// SparkSQLEngine's tokens should be updated
var engineCredentials =
KyuubiHadoopUtils.getCredentialsInternal(UserGroupInformation.getCurrentUser)
var engineCredentials = UserGroupInformation.getCurrentUser.getCredentials
assert(engineCredentials.getToken(hdfsTokenAlias) == creds2.getToken(hdfsTokenAlias))
assert(
engineCredentials.getToken(hiveTokenAlias) == creds2.getToken(new Text(metastoreUris)))
@ -818,8 +817,7 @@ class SparkOperationSuite extends WithSparkSQLEngine with HiveJDBCTests {
val creds3 = createCredentials(currentTime, hdfsTokenAlias.toString, metastoreUris)
sendCredentials(client, creds3)
// SparkSQLEngine's tokens should not be updated
engineCredentials =
KyuubiHadoopUtils.getCredentialsInternal(UserGroupInformation.getCurrentUser)
engineCredentials = UserGroupInformation.getCurrentUser.getCredentials
assert(engineCredentials.getToken(hdfsTokenAlias) == creds2.getToken(hdfsTokenAlias))
assert(
engineCredentials.getToken(hiveTokenAlias) == creds2.getToken(new Text(metastoreUris)))
@ -828,8 +826,7 @@ class SparkOperationSuite extends WithSparkSQLEngine with HiveJDBCTests {
val creds4 = createCredentials(currentTime + 2, "HDFS2", "thrift://localhost:9085")
sendCredentials(client, creds4)
// No token is updated
engineCredentials =
KyuubiHadoopUtils.getCredentialsInternal(UserGroupInformation.getCurrentUser)
engineCredentials = UserGroupInformation.getCurrentUser.getCredentials
assert(engineCredentials.getToken(hdfsTokenAlias) == creds2.getToken(hdfsTokenAlias))
assert(
engineCredentials.getToken(hiveTokenAlias) == creds2.getToken(new Text(metastoreUris)))

20
kyuubi-common/src/main/scala/org/apache/kyuubi/util/KyuubiHadoopUtils.scala
View File

@ -19,7 +19,6 @@ package org.apache.kyuubi.util
import java.io.{ByteArrayInputStream, ByteArrayOutputStream, DataInputStream, DataOutputStream}
import java.util.{Map => JMap}
import javax.security.auth.Subject
import scala.collection.JavaConverters._
@ -38,12 +37,6 @@ object KyuubiHadoopUtils {
classOf[UserGroupInformation].getDeclaredField("subject")
subjectField.setAccessible(true)
private val getCredentialsInternalMethod =
classOf[UserGroupInformation].getDeclaredMethod(
"getCredentialsInternal",
Array.empty[Class[_]]: _*)
getCredentialsInternalMethod.setAccessible(true)
private val tokenMapField =
classOf[Credentials].getDeclaredField("tokenMap")
tokenMapField.setAccessible(true)
@ -76,19 +69,6 @@ object KyuubiHadoopUtils {
creds
}
/**
* Get all tokens in [[UserGroupInformation#subject]] including
* [[org.apache.hadoop.security.token.Token.PrivateToken]] as
* [[UserGroupInformation#getCredentials]] returned Credentials do not contain
* [[org.apache.hadoop.security.token.Token.PrivateToken]].
*/
def getCredentialsInternal(ugi: UserGroupInformation): Credentials = {
// Synchronize to avoid credentials being written while cloning credentials
subjectField.get(ugi).asInstanceOf[Subject] synchronized {
new Credentials(getCredentialsInternalMethod.invoke(ugi).asInstanceOf[Credentials])
}
}
/**
* Get [[Credentials#tokenMap]] by reflection as [[Credentials#getTokenMap]] is not present before
* Hadoop 3.2.1.