Skip to content

HDDS-11472. Avoid recreating external access authorizer on OM state reload #7238

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

Merged
adoroszlai merged 6 commits into from
Sep 30, 2024
Merged

HDDS-11472. Avoid recreating external access authorizer on OM state reload #7238

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c9a45b2
HDDS-11472. Clear IOzoneAuthorizer when instantiating OM
spacemonkd Sep 24, 2024
5a19efc
Return only the static instance of Access authorizer
spacemonkd Sep 25, 2024
c05c5fc
Recreate Ozone authorizer if it is native or null
spacemonkd Sep 25, 2024
7b703d3
Revert changes from Authorizer Factory
spacemonkd Sep 25, 2024
44d62ce
override isNative in OzoneAccessAuthorizer
adoroszlai Sep 26, 2024
29cad66
Merge remote-tracking branch 'origin/master' into HDDS-11472
adoroszlai Sep 26, 2024
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
19 changes: 15 additions & 4 deletions ...ne-manager/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneAuthorizerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
*/
public final class OzoneAuthorizerFactory {

private static IAccessAuthorizer accessAuthorizer;

private OzoneAuthorizerFactory() {
// no instances
}
Expand All @@ -42,7 +44,11 @@ private OzoneAuthorizerFactory() {
* @return authorizer instance for {@link OzoneManager}
*/
public static IAccessAuthorizer forOM(OzoneManager om) {
return create(om, om.getKeyManager(), om.getPrefixManager());
if (null != accessAuthorizer){
return accessAuthorizer;
}
accessAuthorizer = create(om, om.getKeyManager(), om.getPrefixManager());
return accessAuthorizer;
}

/**
Expand All @@ -52,9 +58,14 @@ public static IAccessAuthorizer forOM(OzoneManager om) {
public static IAccessAuthorizer forSnapshot(
OzoneManager om, KeyManager keyManager, PrefixManager prefixManager
) {
return om.getAccessAuthorizer().isNative()
? create(om, keyManager, prefixManager)
: om.getAccessAuthorizer();
if(om.getAccessAuthorizer().isNative()){
if (null != accessAuthorizer) {
return accessAuthorizer;
}
accessAuthorizer = create(om, keyManager, prefixManager);
return accessAuthorizer;
}
return om.getAccessAuthorizer();
}

/**
Expand Down