Skip to content

[KYUUBI #7079] Improve performance of AccessRequest initialization #7081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

[KYUUBI #7079] Improve performance of AccessRequest initialization #7081

Changes from 6 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3c085a8
[KYUUBI #7079] Improve performance of authz rules
wForget Jun 5, 2025
f6169fc
address comment
wForget Jun 5, 2025
9b23700
remove empty line
wForget Jun 5, 2025
01175f3
make userGroupMapping constant
wForget Jun 5, 2025
bd99fcc
fix style
wForget Jun 5, 2025
c8401b5
revert ugi
wForget Jun 5, 2025
6c9e7cf
address comment
wForget Jun 9, 2025
686c45b
Update extensions/spark/kyuubi-spark-authz/src/main/scala/org/apache/…
wForget Jul 8, 2025
99e0bd3
Update extensions/spark/kyuubi-spark-authz/src/main/scala/org/apache/…
wForget Jul 8, 2025
321e3a7
Revert "Update extensions/spark/kyuubi-spark-authz/src/main/scala/org…
wForget Jul 8, 2025
883d135
Revert "Update extensions/spark/kyuubi-spark-authz/src/main/scala/org…
wForget Jul 8, 2025
4b4c4bf
refactor
pan3793 Jul 8, 2025
7847137
nit
pan3793 Jul 8, 2025
48d312a
nit
pan3793 Jul 8, 2025
743863c
nit
pan3793 Jul 9, 2025
ea70d92
Throwable
pan3793 Jul 9, 2025
b902a29
nit
pan3793 Jul 9, 2025
bb469c7
fix
pan3793 Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 32 additions & 9 deletions ...park-authz/src/main/scala/org/apache/kyuubi/plugin/spark/authz/ranger/AccessRequest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import org.apache.ranger.plugin.policyengine.{RangerAccessRequestImpl, RangerPol

import org.apache.kyuubi.plugin.spark.authz.OperationType.OperationType
import org.apache.kyuubi.plugin.spark.authz.ranger.AccessType._
import org.apache.kyuubi.util.reflect.DynMethods
import org.apache.kyuubi.util.reflect.DynMethods.UnboundMethod
import org.apache.kyuubi.util.reflect.ReflectUtils._

case class AccessRequest private (accessType: AccessType) extends RangerAccessRequestImpl
Expand All @@ -45,12 +47,11 @@ object AccessRequest {
req.setUserGroups(userGroups)
req.setAction(opType.toString)
try {
val roles = invokeAs[JSet[String]](
SparkRangerAdminPlugin,
"getRolesFromUserAndGroups",
(classOf[String], userName),
(classOf[JSet[String]], userGroups))
invokeAs[Unit](req, "setUserRoles", (classOf[JSet[String]], roles))
getRolesFromUserAndGroupsMethod.zip(setUserRolesMethod).foreach {
case (getMethod, setMethod) =>
val roles = getMethod.invoke[JSet[String]](SparkRangerAdminPlugin, userName, userGroups)
setMethod.invoke[Unit](req, roles)
}
} catch {
case _: Exception =>
}
Expand All @@ -68,17 +69,39 @@ object AccessRequest {
req
}

private val getRolesFromUserAndGroupsMethod: Option[UnboundMethod] = {
try {
Some(DynMethods.builder("getRolesFromUserAndGroups")
.hiddenImpl(SparkRangerAdminPlugin.getClass, classOf[String], classOf[JSet[String]])
.impl(SparkRangerAdminPlugin.getClass, classOf[String], classOf[JSet[String]])
.buildChecked)
} catch {
case _: Exception => None
}
}

private val setUserRolesMethod: Option[UnboundMethod] = {
try {
Some(DynMethods.builder("setUserRoles")
.hiddenImpl(classOf[AccessRequest], classOf[JSet[String]])
.impl(classOf[AccessRequest], classOf[JSet[String]])
.buildChecked)
} catch {
case _: Exception => None
}
}

private def getUserGroupsFromUgi(user: UserGroupInformation): JSet[String] = {
user.getGroupNames.toSet.asJava
}

private def getUserGroupsFromUserStore(user: UserGroupInformation): Option[JSet[String]] = {
private lazy val userGroupMappingOpt: Option[JHashMap[String, JSet[String]]] = {
Copy link
Member

@pan3793 pan3793 Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if this is safe to cache

Copy link
Member Author

@wForget wForget Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if this is safe to cache

userGroupMapping may be updated by RangerUserStoreRefresher, I will only cache reflect methods

try {
val storeEnricher = invokeAs[AnyRef](SparkRangerAdminPlugin, "getUserStoreEnricher")
val userStore = invokeAs[AnyRef](storeEnricher, "getRangerUserStore")
val userGroupMapping =
invokeAs[JHashMap[String, JSet[String]]](userStore, "getUserGroupMapping")
Some(userGroupMapping.get(user.getShortUserName))
Some(userGroupMapping)
} catch {
case _: NoSuchMethodException =>
None
Expand All @@ -87,7 +110,7 @@ object AccessRequest {

private def getUserGroups(user: UserGroupInformation): JSet[String] = {
if (SparkRangerAdminPlugin.useUserGroupsFromUserStoreEnabled) {
getUserGroupsFromUserStore(user)
userGroupMappingOpt.map(_.get(user.getShortUserName))
.getOrElse(getUserGroupsFromUgi(user))
} else {
getUserGroupsFromUgi(user)
Expand Down
Loading