YARN-31. Fix TestDelegationTokenRenewer to not depend on test order so as to pass tests on jdk7. Contributed by Thomas Graves.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377961 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
cfe25b8828
commit
7fff7b42bf
|
@ -67,3 +67,6 @@ Release 0.23.3 - Unreleased
|
||||||
|
|
||||||
YARN-39. RM-NM secret-keys should be randomly generated and rolled every
|
YARN-39. RM-NM secret-keys should be randomly generated and rolled every
|
||||||
so often. (vinodkv and sseth via sseth)
|
so often. (vinodkv and sseth via sseth)
|
||||||
|
|
||||||
|
YARN-31. Fix TestDelegationTokenRenewer to not depend on test order so as to
|
||||||
|
pass tests on jdk7. (Thomas Graves via vinodkv)
|
||||||
|
|
|
@ -66,6 +66,12 @@ public class TestDelegationTokenRenewer {
|
||||||
private static Token<?> lastRenewed = null;
|
private static Token<?> lastRenewed = null;
|
||||||
private static Token<?> tokenToRenewIn2Sec = null;
|
private static Token<?> tokenToRenewIn2Sec = null;
|
||||||
|
|
||||||
|
private static void reset() {
|
||||||
|
counter = 0;
|
||||||
|
lastRenewed = null;
|
||||||
|
tokenToRenewIn2Sec = null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean handleKind(Text kind) {
|
public boolean handleKind(Text kind) {
|
||||||
return KIND.equals(kind);
|
return KIND.equals(kind);
|
||||||
|
@ -124,6 +130,7 @@ public class TestDelegationTokenRenewer {
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() throws Exception {
|
public void setUp() throws Exception {
|
||||||
|
Renewer.reset();
|
||||||
delegationTokenRenewer = new DelegationTokenRenewer();
|
delegationTokenRenewer = new DelegationTokenRenewer();
|
||||||
delegationTokenRenewer.init(conf);
|
delegationTokenRenewer.init(conf);
|
||||||
delegationTokenRenewer.start();
|
delegationTokenRenewer.start();
|
||||||
|
@ -367,7 +374,7 @@ public class TestDelegationTokenRenewer {
|
||||||
|
|
||||||
Credentials ts = new Credentials();
|
Credentials ts = new Credentials();
|
||||||
MyToken token1 = dfs.getDelegationToken(new Text("user1"));
|
MyToken token1 = dfs.getDelegationToken(new Text("user1"));
|
||||||
|
|
||||||
//to cause this one to be set for renew in 2 secs
|
//to cause this one to be set for renew in 2 secs
|
||||||
Renewer.tokenToRenewIn2Sec = token1;
|
Renewer.tokenToRenewIn2Sec = token1;
|
||||||
LOG.info("token="+token1+" should be renewed for 2 secs");
|
LOG.info("token="+token1+" should be renewed for 2 secs");
|
||||||
|
|
Loading…
Reference in New Issue