Skip to content

HDDS-11869. Enable OM Ratis in TestOzoneDelegationTokenSecretManager #7594

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 5 commits into from
Dec 19, 2024
Merged

HDDS-11869. Enable OM Ratis in TestOzoneDelegationTokenSecretManager #7594

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f077e23
fix TestOzoneDelegationTokenSecretManager
chungen0126 Dec 18, 2024
5852fef
enable ratis
chungen0126 Dec 18, 2024
51eddd1
group change to addToTokenStore
chungen0126 Dec 18, 2024
de540b0
group change to addToTokenStore
chungen0126 Dec 18, 2024
97c2298
remove ratis config in TestOzoneDelegationTokenSecretManager
chungen0126 Dec 19, 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
20 changes: 11 additions & 9 deletions ...src/test/java/org/apache/hadoop/ozone/security/TestOzoneDelegationTokenSecretManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.util.Time;

import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY;
import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMTokenProto.Type.S3AUTHINFO;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down Expand Up @@ -132,14 +131,6 @@ public void setUp() throws Exception {

private OzoneConfiguration createNewTestPath() throws IOException {
OzoneConfiguration config = new OzoneConfiguration();
// When ratis is enabled, tokens are not updated to the store directly by
// OzoneDelegationTokenSecretManager. Tokens are updated via Ratis
// through the DoubleBuffer. Hence, to test
// OzoneDelegationTokenSecretManager, we should disable OM Ratis.
// TODO: Once HA and non-HA code paths are merged in
// OzoneDelegationTokenSecretManager, this test should be updated to
// test both ratis enabled and disabled case.
config.setBoolean(OZONE_OM_RATIS_ENABLE_KEY, false);
File newFolder = folder.toFile();
if (!newFolder.exists()) {
assertTrue(newFolder.mkdirs());
Expand Down Expand Up @@ -257,13 +248,15 @@ private void testRenewTokenSuccessHelper(boolean restartSecretManager)
Token<OzoneTokenIdentifier> token = secretManager.createToken(TEST_USER,
TEST_USER,
TEST_USER);
addToTokenStore(token);
Thread.sleep(10 * 5);

if (restartSecretManager) {
restartSecretManager();
}

long renewalTime = secretManager.renewToken(token, TEST_USER.toString());
addToTokenStore(token);
assertThat(renewalTime).isGreaterThan(0);
}

Expand All @@ -287,6 +280,7 @@ public void testRenewTokenFailure() throws Exception {
secretManager.start(certificateClient);
Token<OzoneTokenIdentifier> token = secretManager.createToken(TEST_USER,
TEST_USER, TEST_USER);
addToTokenStore(token);
AccessControlException exception =
assertThrows(AccessControlException.class,
() -> secretManager.renewToken(token, "rougeUser"));
Expand Down Expand Up @@ -354,6 +348,7 @@ public void testCancelTokenSuccess() throws Exception {
secretManager.start(certificateClient);
Token<OzoneTokenIdentifier> token = secretManager.createToken(TEST_USER,
TEST_USER, TEST_USER);
addToTokenStore(token);
secretManager.cancelToken(token, TEST_USER.toString());
}

Expand Down Expand Up @@ -512,4 +507,11 @@ private void validateHash(byte[] hash, byte[] identifier) throws Exception {
.setSecretKeyClient(secretKeyClient)
.build();
}

private void addToTokenStore(Token<OzoneTokenIdentifier> token) throws IOException {
OzoneTokenIdentifier ozoneTokenIdentifier = OzoneTokenIdentifier.
readProtoBuf(token.getIdentifier());
long renewDate = secretManager.updateToken(token, ozoneTokenIdentifier, expiryTime);
om.getMetadataManager().getDelegationTokenTable().put(ozoneTokenIdentifier, renewDate);
}
}
Loading