Fixed OverallPingAvgTime assert

Author: Xing Lin

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java

@@ -97,6 +97,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 import static org.apache.hadoop.test.MetricsAsserts.assertGaugeGt;
+import static org.apache.hadoop.test.MetricsAsserts.assertGaugeGte;
 import static org.apache.hadoop.test.MetricsAsserts.mockMetricsRecordBuilder;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.apache.hadoop.test.MetricsAsserts.assertCounter;
@@ -1466,9 +1467,11 @@ public void testOverallRpcProcessingTimeMetric() throws Exception {
           server.rpcDetailedMetrics.getOverallRpcProcessingRates();
       rates.snapshot(rb, true);
 
-      // Verify the ping request. AvgTime should be non-zero.
+      // Verify the ping request.
+      // Overall processing time for ping is zero when this test is run together with
+      // the rest of tests. Thus, we use assertGaugeGte() for OverallPingAvgTime.
       assertCounter("OverallPingNumOps", 1L, rb);
-      assertGaugeGt("OverallPingAvgTime", 0, rb);
+      assertGaugeGte("OverallPingAvgTime", 0.0, rb);
 
       // Verify lockAndSleep requests. AvgTime should be greater than 10 ms,
       // since we sleep for 10 and 12 ms respectively.

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java

@@ -358,6 +358,18 @@ public static void assertGaugeGt(String name, double greater,
         getDoubleGauge(name, rb) > greater);
   }
 
+  /**
+   * Assert that a double gauge metric is greater than or equal to a value
+   * @param name  of the metric
+   * @param greater value of the metric should be greater than or equal to this
+   * @param rb  the record builder mock used to getMetrics
+   */
+  public static void assertGaugeGte(String name, double greater,
+      MetricsRecordBuilder rb) {
+    Assert.assertTrue("Bad value for metric " + name,
+        getDoubleGauge(name, rb) >= greater);
+  }
+
   /**
    * Assert that a double gauge metric is greater than a value
    * @param name  of the metric