Skip to content

HDDS-8895. Support dynamic changes ozone.readonly.administrators(SCM). #4977

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 1 commit into from
Jun 27, 2023
Merged

HDDS-8895. Support dynamic changes ozone.readonly.administrators(SCM). #4977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 20 additions & 2 deletions ...s/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@
import static org.apache.hadoop.hdds.security.x509.certificate.authority.CertificateStore.CertType.VALID_CERTS;
import static org.apache.hadoop.hdds.utils.HddsServerUtil.getRemoteUser;
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS;
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_READONLY_ADMINISTRATORS;
import static org.apache.hadoop.ozone.OzoneConsts.CRL_SEQUENCE_ID_KEY;
import static org.apache.hadoop.ozone.OzoneConsts.SCM_SUB_CA_PREFIX;
import static org.apache.hadoop.ozone.OzoneConsts.SCM_ROOT_CA_COMPONENT_NAME;
Expand Down Expand Up @@ -266,7 +267,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
*/
private final String scmStarterUser;
private final OzoneAdmins scmAdmins;
private OzoneAdmins scmReadOnlyAdmins;
private final OzoneAdmins scmReadOnlyAdmins;

/**
* SCM mxbean.
Expand Down Expand Up @@ -389,7 +390,9 @@ private StorageContainerManager(OzoneConfiguration conf,
serviceManager = new SCMServiceManager();
reconfigurationHandler =
new ReconfigurationHandler("SCM", conf, this::checkAdminAccess)
.register(OZONE_ADMINISTRATORS, this::reconfOzoneAdmins);
.register(OZONE_ADMINISTRATORS, this::reconfOzoneAdmins)
.register(OZONE_READONLY_ADMINISTRATORS,
this::reconfOzoneReadOnlyAdmins);

initializeSystemManagers(conf, configurator);

Expand Down Expand Up @@ -2100,6 +2103,10 @@ public Collection<String> getScmAdminUsernames() {
return scmAdmins.getAdminUsernames();
}

public Collection<String> getScmReadOnlyAdminUsernames() {
return scmReadOnlyAdmins.getAdminUsernames();
}

private String reconfOzoneAdmins(String newVal) {
getConfiguration().set(OZONE_ADMINISTRATORS, newVal);
Collection<String> admins = OzoneAdmins.getOzoneAdminsFromConfig(
Expand All @@ -2110,6 +2117,17 @@ private String reconfOzoneAdmins(String newVal) {
return String.valueOf(newVal);
}

private String reconfOzoneReadOnlyAdmins(String newVal) {
getConfiguration().set(OZONE_READONLY_ADMINISTRATORS, newVal);
Collection<String> admins = OzoneAdmins.getOzoneReadOnlyAdminsFromConfig(
getConfiguration());
scmReadOnlyAdmins.setAdminUsernames(admins);
LOG.info("Load conf {} : {}, and now read only admins are: {}",
OZONE_READONLY_ADMINISTRATORS,
newVal, admins);
return String.valueOf(newVal);
}

/**
* This will remove the given SCM node from HA Ring by removing it from
* Ratis Ring.
Expand Down
15 changes: 15 additions & 0 deletions ...tegration-test/src/test/java/org/apache/hadoop/ozone/reconfig/TestScmReconfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS;
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_READONLY_ADMINISTRATORS;
import static org.junit.jupiter.api.Assertions.assertEquals;

/**
Expand All @@ -46,6 +47,7 @@ ReconfigurationHandler getSubject() {
void reconfigurableProperties() {
Set<String> expected = ImmutableSet.<String>builder()
.add(OZONE_ADMINISTRATORS)
.add(OZONE_READONLY_ADMINISTRATORS)
.addAll(new ReplicationManagerConfiguration()
.reconfigurableProperties())
.build();
Expand All @@ -64,6 +66,19 @@ void adminUsernames() throws ReconfigurationException {
getCluster().getStorageContainerManager().getScmAdminUsernames());
}

@Test
void readOnlyAdminUsernames() throws ReconfigurationException {
final String newValue = randomAlphabetic(10);

getSubject().reconfigurePropertyImpl(OZONE_READONLY_ADMINISTRATORS,
newValue);

assertEquals(
ImmutableSet.of(newValue),
getCluster().getStorageContainerManager()
.getScmReadOnlyAdminUsernames());
}

@Test
void replicationInterval() throws ReconfigurationException {
ReplicationManagerConfiguration config = replicationManagerConfig();
Expand Down