Skip to content

Commit d7b5b3d

Browse files
author
slfan1989
committed
YARN-11350. Fix CheckStyle.
1 parent d20a9fc commit d7b5b3d

1 file changed

Lines changed: 11 additions & 21 deletions

File tree

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

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: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ public RouterRMTokenResponse storeNewToken(RouterRMTokenRequest request)
11911191
storeOrUpdateRouterRMDT(request, false);
11921192

11931193
// Get the stored delegationToken from ZK and return.
1194-
RouterStoreToken resultStoreToken = getStoreTokenFromZK(request, false);
1194+
RouterStoreToken resultStoreToken = getStoreTokenFromZK(request);
11951195
long end = clock.getTime();
11961196
opDurations.getStoreNewTokenDuration(start, end);
11971197
return RouterRMTokenResponse.newInstance(resultStoreToken);
@@ -1244,7 +1244,7 @@ public RouterRMTokenResponse updateStoredToken(RouterRMTokenRequest request)
12441244
}
12451245

12461246
// Get the stored delegationToken from ZK and return.
1247-
RouterStoreToken resultStoreToken = getStoreTokenFromZK(request, false);
1247+
RouterStoreToken resultStoreToken = getStoreTokenFromZK(request);
12481248
long end = clock.getTime();
12491249
opDurations.updateStoredTokenDuration(start, end);
12501250
return RouterRMTokenResponse.newInstance(resultStoreToken);
@@ -1287,7 +1287,7 @@ public RouterRMTokenResponse removeStoredToken(RouterRMTokenRequest request)
12871287

12881288
// Check again, first get the data from ZK,
12891289
// if the data is not empty, then delete it
1290-
RouterStoreToken storeToken = getStoreTokenFromZK(request, false);
1290+
RouterStoreToken storeToken = getStoreTokenFromZK(request);
12911291
if (storeToken != null) {
12921292
zkManager.delete(nodePath);
12931293
}
@@ -1331,7 +1331,7 @@ public RouterRMTokenResponse getTokenByRouterStoreToken(RouterRMTokenRequest req
13311331
}
13321332

13331333
// Get the stored delegationToken from ZK and return.
1334-
RouterStoreToken resultStoreToken = getStoreTokenFromZK(request, false);
1334+
RouterStoreToken resultStoreToken = getStoreTokenFromZK(request);
13351335
// return deleted token data.
13361336
long end = clock.getTime();
13371337
opDurations.getTokenByRouterStoreTokenDuration(start, end);
@@ -1437,44 +1437,36 @@ private String getStoreTokenZNodePathByIdentifier(YARNDelegationTokenIdentifier
14371437
* Get RouterStoreToken from ZK.
14381438
*
14391439
* @param request RouterMasterKeyRequest.
1440-
* @param quiet If true is silent mode, no error message is printed at this time,
1441-
* if false is non-silent mode, error message is printed at this time.
14421440
* @return RouterStoreToken.
14431441
* @throws IOException io exception occurs.
14441442
*/
1445-
private RouterStoreToken getStoreTokenFromZK(RouterRMTokenRequest request,
1446-
boolean quiet) throws IOException {
1443+
private RouterStoreToken getStoreTokenFromZK(RouterRMTokenRequest request) throws IOException {
14471444
RouterStoreToken routerStoreToken = request.getRouterStoreToken();
14481445
YARNDelegationTokenIdentifier identifier = routerStoreToken.getTokenIdentifier();
1449-
return getStoreTokenFromZK(identifier, quiet);
1446+
return getStoreTokenFromZK(identifier);
14501447
}
14511448

14521449
/**
14531450
* Get RouterStoreToken from ZK.
14541451
*
1455-
* @param identifier YARN DelegationToken Identifier
1456-
* @param quiet Whether it is in quiet mode,
1457-
* if it is in quiet mode, no exception information will be output.
1452+
* @param identifier YARN DelegationToken Identifier.
14581453
* @return RouterStoreToken.
14591454
* @throws IOException io exception occurs.
14601455
*/
1461-
private RouterStoreToken getStoreTokenFromZK(YARNDelegationTokenIdentifier identifier,
1462-
boolean quiet) throws IOException {
1456+
private RouterStoreToken getStoreTokenFromZK(YARNDelegationTokenIdentifier identifier) throws IOException {
14631457
// get the Token storage path
14641458
String nodePath = getStoreTokenZNodePathByIdentifier(identifier);
1465-
return getStoreTokenFromZK(nodePath, quiet);
1459+
return getStoreTokenFromZK(nodePath);
14661460
}
14671461

14681462
/**
14691463
* Get RouterStoreToken from ZK.
14701464
*
14711465
* @param nodePath Znode location where data is stored.
1472-
* @param quiet Whether it is in quiet mode,
1473-
* if it is in quiet mode, no exception information will be output.
14741466
* @return RouterStoreToken.
14751467
* @throws IOException io exception occurs.
14761468
*/
1477-
private RouterStoreToken getStoreTokenFromZK(String nodePath, boolean quiet)
1469+
private RouterStoreToken getStoreTokenFromZK(String nodePath)
14781470
throws IOException {
14791471
try {
14801472
byte[] data = get(nodePath);
@@ -1487,9 +1479,7 @@ private RouterStoreToken getStoreTokenFromZK(String nodePath, boolean quiet)
14871479
storeToken.readFields(din);
14881480
return storeToken;
14891481
} catch (Exception ex) {
1490-
if (!quiet) {
1491-
LOG.error("No node in path [" + nodePath + "]");
1492-
}
1482+
LOG.error("No node in path [{}]", nodePath, ex);
14931483
throw new IOException(ex);
14941484
}
14951485
}

0 commit comments

Comments
 (0)