Skip to content

YARN-11172. Fix TestClientRMTokens#testDelegationToken introduced by HDFS-16563. #4408

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
steveloughran merged 2 commits into from
Jun 17, 2022
Merged

YARN-11172. Fix TestClientRMTokens#testDelegationToken introduced by HDFS-16563. #4408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
235be55
YARN-11172. Fix TestClientRMTokens#testDelegationToken introduced by …
zhengchenyu Jun 6, 2022
2ab32a9
trigger ci
zhengchenyu Jun 12, 2022
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
6 changes: 3 additions & 3 deletions ...ava/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,9 +518,9 @@ protected DelegationTokenInformation checkToken(TokenIdent identifier)
}
long now = Time.now();
if (info.getRenewDate() < now) {
err =
"Token has" + identifier.getRealUser() + "expired, current time: " + Time.formatTime(now)
+ " expected renewal time: " + Time.formatTime(info.getRenewDate());
err = "Token " + identifier.getRealUser() + " has expired, current time: "
+ Time.formatTime(now) + " expected renewal time: " + Time
.formatTime(info.getRenewDate());
LOG.info("{}, Token={}", err, formatTokenId(identifier));
throw new InvalidToken(err);
}
Expand Down
17 changes: 7 additions & 10 deletions ...nager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMTokens.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.hadoop.yarn.server.resourcemanager;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
Expand All @@ -36,6 +35,7 @@
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;

import org.apache.hadoop.test.LambdaTestUtils;
import org.apache.hadoop.thirdparty.protobuf.InvalidProtocolBufferException;
import org.apache.hadoop.io.DataOutputBuffer;
import org.apache.hadoop.net.NetUtils;
Expand Down Expand Up @@ -111,7 +111,7 @@ public void resetSecretManager() {
}

@Test
public void testDelegationToken() throws IOException, InterruptedException {
public void testDelegationToken() throws Exception {

final YarnConfiguration conf = new YarnConfiguration();
conf.set(YarnConfiguration.RM_PRINCIPAL, "testuser/localhost@apache.org");
Expand Down Expand Up @@ -198,14 +198,11 @@ public void testDelegationToken() throws IOException, InterruptedException {
}
Thread.sleep(50l);
LOG.info("At time: " + System.currentTimeMillis() + ", token should be invalid");
// Token should have expired.
try {
clientRMWithDT.getNewApplication(request);
fail("Should not have succeeded with an expired token");
} catch (Exception e) {
assertEquals(InvalidToken.class.getName(), e.getClass().getName());
assertTrue(e.getMessage().contains("is expired"));
}
// Token should have expired.
final ApplicationClientProtocol finalClientRMWithDT = clientRMWithDT;
final GetNewApplicationRequest finalRequest = request;
LambdaTestUtils.intercept(InvalidToken.class, "Token has expired",
() -> finalClientRMWithDT.getNewApplication(finalRequest));

// Test cancellation
// Stop the existing proxy, start another.
Expand Down