YARN-11158. Fix CheckStyle.

Author: slfan1989

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java

@@ -519,10 +519,20 @@ public void getRMNodeLabelsFailed() {
       metrics.incrGetRMNodeLabelsFailedRetrieved();
     }
 
-    public void getCheckUserAccessToQueueRetrieved() {
-      LOG.info("Mocked: failed checkUserAccessToQueueRetrieved call");
+    public void getCheckUserAccessToQueueFailed() {
+      LOG.info("Mocked: failed checkUserAccessToQueue call");
       metrics.incrCheckUserAccessToQueueFailedRetrieved();
     }
+
+    public void getDelegationTokenFailed() {
+      LOG.info("Mocked: failed getDelegationToken call");
+      metrics.incrGetDelegationTokenFailedRetrieved();
+    }
+
+    public void getRenewDelegationTokenFailed() {
+      LOG.info("Mocked: failed renewDelegationToken call");
+      metrics.incrRenewDelegationTokenFailedRetrieved();
+    }
   }
 
   // Records successes for all calls
@@ -743,6 +753,16 @@ public void getCheckUserAccessToQueueRetrieved(long duration) {
       LOG.info("Mocked: successful CheckUserAccessToQueue call with duration {}", duration);
       metrics.succeededCheckUserAccessToQueueRetrieved(duration);
     }
+
+    public void getGetDelegationTokenRetrieved(long duration) {
+      LOG.info("Mocked: successful GetDelegationToken call with duration {}", duration);
+      metrics.succeededGetDelegationTokenRetrieved(duration);
+    }
+
+    public void getRenewDelegationTokenRetrieved(long duration) {
+      LOG.info("Mocked: successful RenewDelegationToken call with duration {}", duration);
+      metrics.succeededRenewDelegationTokenRetrieved(duration);
+    }
   }
 
   @Test
@@ -1510,7 +1530,7 @@ public void testGetRMNodeLabelsRetrievedFailed() {
   }
 
   @Test
-  public void testCheckUserAccessToQueueRetrievedRetrieved() {
+  public void testCheckUserAccessToQueueRetrieved() {
     long totalGoodBefore = metrics.getNumSucceededCheckUserAccessToQueueRetrieved();
     goodSubCluster.getCheckUserAccessToQueueRetrieved(150);
     Assert.assertEquals(totalGoodBefore + 1,
@@ -1527,8 +1547,54 @@ public void testCheckUserAccessToQueueRetrievedRetrieved() {
   @Test
   public void testCheckUserAccessToQueueRetrievedFailed() {
     long totalBadBefore = metrics.getCheckUserAccessToQueueFailedRetrieved();
-    badSubCluster.getCheckUserAccessToQueueRetrieved();
+    badSubCluster.getCheckUserAccessToQueueFailed();
     Assert.assertEquals(totalBadBefore + 1,
         metrics.getCheckUserAccessToQueueFailedRetrieved());
   }
+
+  @Test
+  public void testGetDelegationTokenRetrieved() {
+    long totalGoodBefore = metrics.getNumSucceededGetDelegationTokenRetrieved();
+    goodSubCluster.getGetDelegationTokenRetrieved(150);
+    Assert.assertEquals(totalGoodBefore + 1,
+        metrics.getNumSucceededGetDelegationTokenRetrieved());
+    Assert.assertEquals(150,
+        metrics.getLatencySucceededGetDelegationTokenRetrieved(), ASSERT_DOUBLE_DELTA);
+    goodSubCluster.getGetDelegationTokenRetrieved(300);
+    Assert.assertEquals(totalGoodBefore + 2,
+        metrics.getNumSucceededGetDelegationTokenRetrieved());
+    Assert.assertEquals(225,
+        metrics.getLatencySucceededGetDelegationTokenRetrieved(), ASSERT_DOUBLE_DELTA);
+  }
+
+  @Test
+  public void testGetDelegationTokenRetrievedFailed() {
+    long totalBadBefore = metrics.getDelegationTokenFailedRetrieved();
+    badSubCluster.getDelegationTokenFailed();
+    Assert.assertEquals(totalBadBefore + 1,
+        metrics.getDelegationTokenFailedRetrieved());
+  }
+
+  @Test
+  public void testRenewDelegationTokenRetrieved() {
+    long totalGoodBefore = metrics.getNumSucceededRenewDelegationTokenRetrieved();
+    goodSubCluster.getRenewDelegationTokenRetrieved(150);
+    Assert.assertEquals(totalGoodBefore + 1,
+        metrics.getNumSucceededRenewDelegationTokenRetrieved());
+    Assert.assertEquals(150,
+        metrics.getLatencySucceededRenewDelegationTokenRetrieved(), ASSERT_DOUBLE_DELTA);
+    goodSubCluster.getRenewDelegationTokenRetrieved(300);
+    Assert.assertEquals(totalGoodBefore + 2,
+        metrics.getNumSucceededRenewDelegationTokenRetrieved());
+    Assert.assertEquals(225,
+        metrics.getLatencySucceededRenewDelegationTokenRetrieved(), ASSERT_DOUBLE_DELTA);
+  }
+
+  @Test
+  public void testRenewDelegationTokenRetrievedFailed() {
+    long totalBadBefore = metrics.getRenewDelegationTokenFailedRetrieved();
+    badSubCluster.getRenewDelegationTokenFailed();
+    Assert.assertEquals(totalBadBefore + 1,
+        metrics.getRenewDelegationTokenFailedRetrieved());
+  }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestFederationClientInterceptor.java

@@ -1584,8 +1584,9 @@ public void testGetDelegationToken() throws IOException, YarnException {
     // RM_DELEGATION_TOKEN
     //
     // 2. We maintain the compatibility with RMDelegationTokenIdentifier,
-    // we can serialize the token into RMDelegationTokenIdentifier,
-    // we can get the issueDate, and compare the data in the StateStore,
+    // we can serialize the token into RMDelegationTokenIdentifier.
+    //
+    // 3. We can get the issueDate, and compare the data in the StateStore,
     // the data should be consistent.
 
     // Step1. We apply for DelegationToken for renewer1
@@ -1616,7 +1617,12 @@ public void testGetDelegationToken() throws IOException, YarnException {
     Assert.assertEquals((issueDate + tokenMaxLifetime), maxDate);
 
     RouterRMDTSecretManagerState managerState = stateStore.getRouterRMSecretManagerState();
+    Assert.assertNotNull(managerState);
+
     Map<RMDelegationTokenIdentifier, Long> delegationTokenState = managerState.getTokenState();
+    Assert.assertNotNull(delegationTokenState);
+    Assert.assertTrue(delegationTokenState.containsKey(rMDelegationTokenIdentifier));
+
     long tokenRenewInterval = this.getConf().getLong(
         YarnConfiguration.RM_DELEGATION_TOKEN_RENEW_INTERVAL_KEY,
         YarnConfiguration.RM_DELEGATION_TOKEN_RENEW_INTERVAL_DEFAULT);
@@ -1626,35 +1632,49 @@ public void testGetDelegationToken() throws IOException, YarnException {
 
   @Test
   public void testRenewDelegationToken() throws IOException, YarnException {
-
     // We design such a unit test to check
     // that the execution of the GetDelegationToken method is as expected
     // 1. Call GetDelegationToken to apply for delegationToken.
     // 2. Call renewDelegationToken to refresh delegationToken.
     // By looking at the code of AbstractDelegationTokenSecretManager#renewToken,
     // we know that renewTime is calculated as Math.min(id.getMaxDate(), now + tokenRenewInterval)
-    // so renewTime will be less than or equal to maxDate
+    // so renewTime will be less than or equal to maxDate.
+    // 3. We will compare whether the expirationTime returned to the
+    // client is consistent with the renewDate in the stateStore.
 
+    // Step1. Call GetDelegationToken to apply for delegationToken.
     GetDelegationTokenRequest request = mock(GetDelegationTokenRequest.class);
     when(request.getRenewer()).thenReturn("renewer2");
     GetDelegationTokenResponse response = interceptor.getDelegationToken(request);
     Assert.assertNotNull(response);
     Token delegationToken = response.getRMDelegationToken();
 
-    // Step2. Serialize the returned Token as RMDelegationTokenIdentifier.
     org.apache.hadoop.security.token.Token<RMDelegationTokenIdentifier> token =
         ConverterUtils.convertFromYarn(delegationToken, (Text) null);
     RMDelegationTokenIdentifier rMDelegationTokenIdentifier = token.decodeIdentifier();
     String renewer = rMDelegationTokenIdentifier.getRenewer().toString();
     long maxDate = rMDelegationTokenIdentifier.getMaxDate();
     Assert.assertEquals("renewer2", renewer);
 
+    // Step2. Call renewDelegationToken to refresh delegationToken.
     RenewDelegationTokenRequest renewRequest = Records.newRecord(RenewDelegationTokenRequest.class);
     renewRequest.setDelegationToken(delegationToken);
     RenewDelegationTokenResponse renewResponse = interceptor.renewDelegationToken(renewRequest);
     Assert.assertNotNull(renewResponse);
 
     long expDate = renewResponse.getNextExpirationTime();
     Assert.assertTrue(expDate <= maxDate);
+
+    // Step3. Compare whether the expirationTime returned to
+    // the client is consistent with the renewDate in the stateStore
+    RouterRMDTSecretManagerState managerState = stateStore.getRouterRMSecretManagerState();
+    Map<RMDelegationTokenIdentifier, Long> delegationTokenState = managerState.getTokenState();
+    Assert.assertNotNull(delegationTokenState);
+    Assert.assertTrue(delegationTokenState.containsKey(rMDelegationTokenIdentifier));
+    long renewDate = delegationTokenState.get(rMDelegationTokenIdentifier);
+    Assert.assertEquals(expDate, renewDate);
   }
+
+
+
 }