Skip to content

Commit e441f50

Browse files
author
slfan1989
committed
YARN-11350. Fix CheckStyle.
1 parent a5ea248 commit e441f50

File tree

2 files changed

+87
-6
lines changed

2 files changed

+87
-6
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/store/impl/ZookeeperFederationStateStore.java

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,7 @@
9999
import org.apache.hadoop.yarn.server.federation.store.records.impl.pb.SubClusterPolicyConfigurationPBImpl;
100100
import org.apache.hadoop.yarn.server.federation.store.records.RouterMasterKey;
101101
import org.apache.hadoop.yarn.server.federation.store.records.RouterStoreToken;
102-
import org.apache.hadoop.yarn.server.federation.store.utils.FederationApplicationHomeSubClusterStoreInputValidator;
103-
import org.apache.hadoop.yarn.server.federation.store.utils.FederationMembershipStateStoreInputValidator;
104-
import org.apache.hadoop.yarn.server.federation.store.utils.FederationPolicyStoreInputValidator;
105-
import org.apache.hadoop.yarn.server.federation.store.utils.FederationStateStoreUtils;
106-
import org.apache.hadoop.yarn.server.federation.store.utils.FederationReservationHomeSubClusterStoreInputValidator;
102+
import org.apache.hadoop.yarn.server.federation.store.utils.*;
107103
import org.apache.hadoop.yarn.server.records.Version;
108104
import org.apache.hadoop.yarn.api.records.ReservationId;
109105
import org.apache.hadoop.yarn.util.Clock;
@@ -993,6 +989,9 @@ public RouterMasterKeyResponse getMasterKeyByDelegationKey(RouterMasterKeyReques
993989
@Override
994990
public RouterRMTokenResponse storeNewToken(RouterRMTokenRequest request)
995991
throws YarnException, IOException {
992+
993+
FederationRouterRMTokenInputValidator.validate(request);
994+
996995
try {
997996
// add delegationToken
998997
storeOrUpdateRouterRMDT(request.getRouterStoreToken(), false);
@@ -1012,6 +1011,9 @@ public RouterRMTokenResponse storeNewToken(RouterRMTokenRequest request)
10121011
@Override
10131012
public RouterRMTokenResponse updateStoredToken(RouterRMTokenRequest request)
10141013
throws YarnException, IOException {
1014+
1015+
FederationRouterRMTokenInputValidator.validate(request);
1016+
10151017
try {
10161018
RouterStoreToken routerStoreToken = request.getRouterStoreToken();
10171019
YARNDelegationTokenIdentifier tokenIdentifier = routerStoreToken.getTokenIdentifier();
@@ -1046,6 +1048,9 @@ public RouterRMTokenResponse updateStoredToken(RouterRMTokenRequest request)
10461048
@Override
10471049
public RouterRMTokenResponse removeStoredToken(RouterRMTokenRequest request)
10481050
throws YarnException, IOException {
1051+
1052+
FederationRouterRMTokenInputValidator.validate(request);
1053+
10491054
try {
10501055
RouterStoreToken routerStoreToken = request.getRouterStoreToken();
10511056
YARNDelegationTokenIdentifier tokenIdentifier = routerStoreToken.getTokenIdentifier();
@@ -1071,10 +1076,20 @@ public RouterRMTokenResponse removeStoredToken(RouterRMTokenRequest request)
10711076
}
10721077
}
10731078

1079+
/**
1080+
* The Router Supports GetTokenByRouterStoreToken.
1081+
*
1082+
* @param request The request contains RouterRMToken (RMDelegationTokenIdentifier and renewDate)
1083+
* @return RouterRMTokenResponse.
1084+
* @throws YarnException if the call to the state store is unsuccessful
1085+
* @throws IOException An IO Error occurred
1086+
*/
10741087
@Override
10751088
public RouterRMTokenResponse getTokenByRouterStoreToken(RouterRMTokenRequest request)
10761089
throws YarnException, IOException {
1077-
request.getRouterStoreToken().getTokenIdentifier();
1090+
1091+
FederationRouterRMTokenInputValidator.validate(request);
1092+
10781093
try {
10791094
RouterStoreToken routerStoreToken = request.getRouterStoreToken();
10801095
YARNDelegationTokenIdentifier tokenIdentifier = routerStoreToken.getTokenIdentifier();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/**
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
19+
package org.apache.hadoop.yarn.server.federation.store.utils;
20+
21+
import org.apache.hadoop.yarn.security.client.YARNDelegationTokenIdentifier;
22+
import org.apache.hadoop.yarn.server.federation.store.exception.FederationStateStoreInvalidInputException;
23+
import org.apache.hadoop.yarn.server.federation.store.records.RouterRMTokenRequest;
24+
import org.apache.hadoop.yarn.server.federation.store.records.RouterStoreToken;
25+
import org.slf4j.Logger;
26+
import org.slf4j.LoggerFactory;
27+
28+
public final class FederationRouterRMTokenInputValidator {
29+
30+
private static final Logger LOG =
31+
LoggerFactory.getLogger(FederationRouterRMTokenInputValidator.class);
32+
33+
private FederationRouterRMTokenInputValidator() {
34+
}
35+
36+
public static void validate(RouterRMTokenRequest request)
37+
throws FederationStateStoreInvalidInputException {
38+
39+
if (request == null) {
40+
String message = "Missing RouterRMToken Request."
41+
+ " Please try again by specifying a router rm token information.";
42+
LOG.warn(message);
43+
throw new FederationStateStoreInvalidInputException(message);
44+
}
45+
46+
RouterStoreToken storeToken = request.getRouterStoreToken();
47+
if (storeToken == null) {
48+
String message = "Missing RouterStoreToken."
49+
+ " Please try again by specifying a router rm token information.";
50+
LOG.warn(message);
51+
throw new FederationStateStoreInvalidInputException(message);
52+
}
53+
54+
try {
55+
YARNDelegationTokenIdentifier identifier = storeToken.getTokenIdentifier();
56+
if (identifier == null) {
57+
String message = "Missing YARNDelegationTokenIdentifier."
58+
+ " Please try again by specifying a router rm token information.";
59+
LOG.warn(message);
60+
throw new FederationStateStoreInvalidInputException(message);
61+
}
62+
} catch (Exception e) {
63+
throw new FederationStateStoreInvalidInputException(e);
64+
}
65+
}
66+
}

0 commit comments

Comments
 (0)