YARN-11350. Fix CheckStyle.

Author: slfan1989

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

@@ -114,8 +114,9 @@ RouterRMTokenResponse getTokenByRouterStoreToken(RouterRMTokenRequest request)
       throws YarnException, IOException;
 
   /**
+   * The Router Supports incrementDelegationTokenSeqNum.
    *
-   * @return
+   * @return DelegationTokenSeqNum.
    */
   int incrementDelegationTokenSeqNum();
 }

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

@@ -240,12 +240,12 @@ public void init(Configuration conf) throws YarnException {
       zkManager.createRootDirRecursively(routerRMDTSecretManagerRoot, zkAcl);
       zkManager.createRootDirRecursively(routerRMDTMasterKeysRootPath, zkAcl);
       zkManager.createRootDirRecursively(routerRMDelegationTokensRootPath, zkAcl);
-      // zkManager.createRootDirRecursively(routerRMSequenceNumberPath, zkAcl);
     } catch (Exception e) {
       String errMsg = "Cannot create base directories: " + e.getMessage();
       FederationStateStoreUtils.logAndThrowStoreException(LOG, errMsg);
     }
 
+    // Distributed sequenceNum.
     try {
       seqNumBatchSize = conf.getInt(ZK_DTSM_TOKEN_SEQNUM_BATCH_SIZE,
           ZK_DTSM_TOKEN_SEQNUM_BATCH_SIZE_DEFAULT);
@@ -270,6 +270,15 @@ public void init(Configuration conf) throws YarnException {
 
   @Override
   public void close() throws Exception {
+
+    try {
+      if (delTokSeqCounter != null) {
+        delTokSeqCounter.close();
+      }
+    } catch (Exception e) {
+      LOG.error("Could not Stop Delegation Token Counter", e);
+    }
+
     if (zkManager != null) {
       zkManager.close();
     }
@@ -1461,11 +1470,10 @@ public synchronized int incrementDelegationTokenSeqNum() {
         currentSeqNum = incrSharedCount(delTokSeqCounter, seqNumBatchSize);
         currentMaxSeqNum = currentSeqNum + seqNumBatchSize;
         LOG.info("Fetched new range of seq num, from {} to {} ",
-                currentSeqNum+1, currentMaxSeqNum);
+            currentSeqNum + 1, currentMaxSeqNum);
       } catch (InterruptedException e) {
         // The ExpirationThread is just finishing.. so dont do anything..
-        LOG.debug(
-                "Thread interrupted while performing token counter increment", e);
+        LOG.debug("Thread interrupted while performing token counter increment", e);
         Thread.currentThread().interrupt();
       } catch (Exception e) {
         throw new RuntimeException("Could not increment shared counter !!", e);
@@ -1476,7 +1484,7 @@ public synchronized int incrementDelegationTokenSeqNum() {
   }
 
   private int incrSharedCount(SharedCount sharedCount, int batchSize)
-          throws Exception {
+      throws Exception {
     while (true) {
       // Loop until we successfully increment the counter
       VersionedValue<Integer> versionedValue = sharedCount.getVersionedValue();

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

@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 
-import org.apache.commons.lang3.NotImplementedException;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.retry.RetryNTimes;
@@ -171,38 +170,30 @@ public void testMetricsInited() throws Exception {
     MetricsRecords.assertMetric(record, "UpdateReservationHomeSubClusterNumOps",  expectOps);
   }
 
-  // @Test(expected = NotImplementedException.class)
   public void testStoreNewMasterKey() throws Exception {
     super.testStoreNewMasterKey();
   }
 
-  // @Test(expected = NotImplementedException.class)
   public void testGetMasterKeyByDelegationKey() throws YarnException, IOException {
     super.testGetMasterKeyByDelegationKey();
   }
 
-  // @Test(expected = NotImplementedException.class)
   public void testRemoveStoredMasterKey() throws YarnException, IOException {
     super.testRemoveStoredMasterKey();
   }
 
-  // @Test(expected = NotImplementedException.class)
   public void testStoreNewToken() throws IOException, YarnException {
     super.testStoreNewToken();
-    LOG.info("xxxx");
   }
 
-  // @Test(expected = NotImplementedException.class)
   public void testUpdateStoredToken() throws IOException, YarnException {
     super.testUpdateStoredToken();
   }
 
-  // @Test(expected = NotImplementedException.class)
   public void testRemoveStoredToken() throws IOException, YarnException {
     super.testRemoveStoredToken();
   }
 
-  // @Test(expected = NotImplementedException.class)
   public void testGetTokenByRouterStoreToken() throws IOException, YarnException {
     super.testGetTokenByRouterStoreToken();
   }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/federation/FederationStateStoreService.java

@@ -423,6 +423,11 @@ public RouterRMTokenResponse getTokenByRouterStoreToken(RouterRMTokenRequest req
     return stateStoreClient.getTokenByRouterStoreToken(request);
   }
 
+  @Override
+  public int incrementDelegationTokenSeqNum() {
+    return stateStoreClient.incrementDelegationTokenSeqNum();
+  }
+
   /**
    * Create a thread that cleans up the app.
    * @param stage rm-start/rm-stop.