Skip to content

Commit 0897eed

Browse files
author
slfan1989
committed
YARN-11350. Fix CheckStyle.
1 parent 4818856 commit 0897eed

4 files changed

Lines changed: 92 additions & 231 deletions

File tree

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/store/impl/FederationStateStoreBaseTest.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@ public abstract class FederationStateStoreBaseTest {
9797

9898
protected abstract FederationStateStore createStateStore();
9999

100+
protected abstract void checkRouterMasterKey(DelegationKey delegationKey,
101+
RouterMasterKey routerMasterKey) throws YarnException, IOException;
102+
103+
protected abstract void checkRouterStoreToken(RMDelegationTokenIdentifier identifier,
104+
RouterStoreToken token) throws YarnException, IOException;
105+
100106
private Configuration conf;
101107

102108
@Before
@@ -876,6 +882,8 @@ public void testStoreNewMasterKey() throws Exception {
876882
Assert.assertEquals(routerMasterKey.getKeyId(), routerMasterKeyResp.getKeyId());
877883
Assert.assertEquals(routerMasterKey.getKeyBytes(), routerMasterKeyResp.getKeyBytes());
878884
Assert.assertEquals(routerMasterKey.getExpiryDate(), routerMasterKeyResp.getExpiryDate());
885+
886+
checkRouterMasterKey(key, routerMasterKey);
879887
}
880888

881889
@Test
@@ -949,6 +957,9 @@ public void testStoreNewToken() throws IOException, YarnException {
949957
Assert.assertNotNull(storeTokenResp);
950958
Assert.assertEquals(storeToken.getRenewDate(), storeTokenResp.getRenewDate());
951959
Assert.assertEquals(storeToken.getTokenIdentifier(), storeTokenResp.getTokenIdentifier());
960+
961+
checkRouterStoreToken(identifier, storeToken);
962+
checkRouterStoreToken(identifier, storeTokenResp);
952963
}
953964

954965
@Test
@@ -981,6 +992,8 @@ public void testUpdateStoredToken() throws IOException, YarnException {
981992
Assert.assertNotNull(updateTokenResp);
982993
Assert.assertEquals(updateToken.getRenewDate(), updateTokenResp.getRenewDate());
983994
Assert.assertEquals(updateToken.getTokenIdentifier(), updateTokenResp.getTokenIdentifier());
995+
996+
checkRouterStoreToken(identifier, updateTokenResp);
984997
}
985998

986999
@Test
@@ -1029,5 +1042,7 @@ public void testGetTokenByRouterStoreToken() throws IOException, YarnException {
10291042
Assert.assertNotNull(getStoreTokenResp);
10301043
Assert.assertEquals(getStoreTokenResp.getRenewDate(), storeToken.getRenewDate());
10311044
Assert.assertEquals(getStoreTokenResp.getTokenIdentifier(), storeToken.getTokenIdentifier());
1045+
1046+
checkRouterStoreToken(identifier, getStoreTokenResp);
10321047
}
10331048
}

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/store/impl/TestMemoryFederationStateStore.java

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,20 @@
1818
package org.apache.hadoop.yarn.server.federation.store.impl;
1919

2020
import org.apache.hadoop.conf.Configuration;
21+
import org.apache.hadoop.security.token.delegation.DelegationKey;
2122
import org.apache.hadoop.yarn.conf.YarnConfiguration;
23+
import org.apache.hadoop.yarn.exceptions.YarnException;
24+
import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
2225
import org.apache.hadoop.yarn.server.federation.store.FederationStateStore;
26+
import org.apache.hadoop.yarn.server.federation.store.records.RouterMasterKey;
27+
import org.apache.hadoop.yarn.server.federation.store.records.RouterStoreToken;
28+
29+
import java.io.IOException;
2330

2431
/**
2532
* Unit tests for MemoryFederationStateStore.
2633
*/
27-
public class TestMemoryFederationStateStore
28-
extends FederationStateStoreBaseTest {
34+
public class TestMemoryFederationStateStore extends FederationStateStoreBaseTest {
2935

3036
@Override
3137
protected FederationStateStore createStateStore() {
@@ -34,4 +40,14 @@ protected FederationStateStore createStateStore() {
3440
super.setConf(conf);
3541
return new MemoryFederationStateStore();
3642
}
43+
44+
@Override
45+
protected void checkRouterMasterKey(DelegationKey delegationKey,
46+
RouterMasterKey routerMasterKey) throws YarnException, IOException {
47+
}
48+
49+
@Override
50+
protected void checkRouterStoreToken(RMDelegationTokenIdentifier identifier,
51+
RouterStoreToken token) throws YarnException, IOException {
52+
}
3753
}

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/store/impl/TestSQLFederationStateStore.java

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,17 @@
1818
package org.apache.hadoop.yarn.server.federation.store.impl;
1919

2020
import org.apache.commons.lang3.NotImplementedException;
21+
import org.apache.hadoop.security.token.delegation.DelegationKey;
2122
import org.apache.hadoop.test.LambdaTestUtils;
2223
import org.apache.hadoop.util.Time;
2324
import org.apache.hadoop.yarn.api.records.ApplicationId;
2425
import org.apache.hadoop.yarn.api.records.ReservationId;
2526
import org.apache.hadoop.yarn.conf.YarnConfiguration;
2627
import org.apache.hadoop.yarn.exceptions.YarnException;
28+
import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
2729
import org.apache.hadoop.yarn.server.federation.store.FederationStateStore;
2830
import org.apache.hadoop.yarn.server.federation.store.metrics.FederationStateStoreClientMetrics;
29-
import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
30-
import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
31-
import org.apache.hadoop.yarn.server.federation.store.records.SubClusterRegisterRequest;
32-
import org.apache.hadoop.yarn.server.federation.store.records.ReservationHomeSubCluster;
33-
import org.apache.hadoop.yarn.server.federation.store.records.AddReservationHomeSubClusterRequest;
34-
import org.apache.hadoop.yarn.server.federation.store.records.UpdateReservationHomeSubClusterRequest;
35-
import org.apache.hadoop.yarn.server.federation.store.records.DeleteReservationHomeSubClusterRequest;
31+
import org.apache.hadoop.yarn.server.federation.store.records.*;
3632
import org.apache.hadoop.yarn.server.federation.store.utils.FederationStateStoreUtils;
3733
import org.junit.Assert;
3834
import org.junit.Test;
@@ -592,4 +588,14 @@ public void testRemoveStoredToken() throws IOException, YarnException {
592588
public void testGetTokenByRouterStoreToken() throws IOException, YarnException {
593589
super.testGetTokenByRouterStoreToken();
594590
}
591+
592+
@Override
593+
protected void checkRouterMasterKey(DelegationKey delegationKey,
594+
RouterMasterKey routerMasterKey) throws YarnException, IOException {
595+
}
596+
597+
@Override
598+
protected void checkRouterStoreToken(RMDelegationTokenIdentifier identifier,
599+
RouterStoreToken token) throws YarnException, IOException {
600+
}
595601
}

0 commit comments

Comments
 (0)