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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c9a45b2
HDDS-11472. Clear IOzoneAuthorizer when instantiating OM
devabhishekpal Sep 24, 2024
5a19efc
Return only the static instance of Access authorizer
devabhishekpal Sep 25, 2024
c05c5fc
Recreate Ozone authorizer if it is native or null
devabhishekpal Sep 25, 2024
7b703d3
Revert changes from Authorizer Factory
devabhishekpal 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
9 changes: 7 additions & 2 deletions ...zone/common/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneAccessAuthorizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with this
* work for additional information regarding copyright ownership. The ASF
Expand All @@ -19,7 +19,7 @@
import org.apache.hadoop.ozone.om.exceptions.OMException;

/**
* Default implementation for {@link IAccessAuthorizer}.
* No-op implementation for {@link IAccessAuthorizer}, allows everything.
* */
public class OzoneAccessAuthorizer implements IAccessAuthorizer {

Expand All @@ -35,4 +35,9 @@ public boolean checkAccess(IOzoneObj ozoneObject, RequestContext context)
throws OMException {
return true;
}

@Override
public boolean isNative() {
return true;
}
}
8 changes: 7 additions & 1 deletion hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,13 @@ private void instantiateServices(boolean withNewSnapshot) throws IOException {
prefixManager = new PrefixManagerImpl(this, metadataManager, isRatisEnabled);
keyManager = new KeyManagerImpl(this, scmClient, configuration,
perfMetrics);
accessAuthorizer = OzoneAuthorizerFactory.forOM(this);
// If authorizer is not initialized or the authorizer is Native
// re-initialize the authorizer, else for non-native authorizer
// like ranger we can reuse previous value if it is initialized
if (null == accessAuthorizer || accessAuthorizer.isNative()) {
accessAuthorizer = OzoneAuthorizerFactory.forOM(this);
}

omMetadataReader = new OmMetadataReader(keyManager, prefixManager,
this, LOG, AUDIT, metrics, accessAuthorizer);
// Active DB's OmMetadataReader instance does not need to be reference
Expand Down