HDDS-14212 Fix review comments #1

Author: greenwich

hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/GrpcOmTransport.java

@@ -200,7 +200,7 @@ public OMResponse submitRequest(OMRequest payload) throws IOException {
         }
         Exception exp = new Exception(e);
         tryOtherHost = shouldRetry(unwrapException(exp),
-            expectedFailoverCount, requestFailoverCount++);
+            expectedFailoverCount, ++requestFailoverCount);
         if (!tryOtherHost) {
           throw new OMException(resultCode);
         }

hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/protocolPB/TestS3GrpcOmTransport.java

@@ -222,9 +222,8 @@ public void testGrpcFailoverProxyExhaustRetry() throws Exception {
 
   @Test
   public void testGrpcFailoverProxyCalculatesFailoverCountPerRequest() throws Exception {
-    final int expectedRequest1FailoverAttemptsCount = 3;
-    final int expectedRequest2FailoverAttemptsCount = 1;
     final int maxFailoverAttempts = 2;
+    final int expectedRequest2FailoverAttemptsCount = 1;
     doFailover = true;
     completeFailover = false;
     conf.setInt(OzoneConfigKeys.OZONE_CLIENT_FAILOVER_MAX_ATTEMPTS_KEY, maxFailoverAttempts);
@@ -233,10 +232,11 @@ public void testGrpcFailoverProxyCalculatesFailoverCountPerRequest() throws Exce
     client.startClient(channel);
 
     assertThrows(Exception.class, () -> client.submitRequest(arbitraryOmRequest()));
-    assertEquals(expectedRequest1FailoverAttemptsCount, failoverCount);
+    assertEquals(maxFailoverAttempts, failoverCount);
 
     failoverCount = 0;
     completeFailover = true;
+    //No exception this time
     client.submitRequest(arbitraryOmRequest());
 
     assertEquals(expectedRequest2FailoverAttemptsCount, failoverCount);