From b88b6826c9a31554233b6ca69dc065a001253f30 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <6454655+adoroszlai@users.noreply.github.com>
Date: Wed, 18 Sep 2019 02:31:08 +0200
Subject: [PATCH] HDDS-2136. OM block allocation metric not paired with its
 failures (#1460)

---
 .../java/org/apache/hadoop/ozone/om/OMMetrics.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java
index a9a76b314f..198e931a29 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java
@@ -60,7 +60,7 @@ public class OMMetrics {
   private @Metric MutableCounterLong numKeyLists;
   private @Metric MutableCounterLong numVolumeLists;
   private @Metric MutableCounterLong numKeyCommits;
-  private @Metric MutableCounterLong numAllocateBlockCalls;
+  private @Metric MutableCounterLong numBlockAllocations;
   private @Metric MutableCounterLong numGetServiceLists;
   private @Metric MutableCounterLong numListS3Buckets;
   private @Metric MutableCounterLong numInitiateMultipartUploads;
@@ -90,7 +90,7 @@ public class OMMetrics {
   private @Metric MutableCounterLong numKeyListFails;
   private @Metric MutableCounterLong numVolumeListFails;
   private @Metric MutableCounterLong numKeyCommitFails;
-  private @Metric MutableCounterLong numBlockAllocateCallFails;
+  private @Metric MutableCounterLong numBlockAllocationFails;
   private @Metric MutableCounterLong numGetServiceListFails;
   private @Metric MutableCounterLong numListS3BucketsFails;
   private @Metric MutableCounterLong numInitiateMultipartUploadFails;
@@ -474,11 +474,11 @@ public void incNumKeyCommitFails() {
   }
 
   public void incNumBlockAllocateCalls() {
-    numAllocateBlockCalls.incr();
+    numBlockAllocations.incr();
   }
 
   public void incNumBlockAllocateCallFails() {
-    numBlockAllocateCallFails.incr();
+    numBlockAllocationFails.incr();
   }
 
   public void incNumBucketListFails() {
@@ -702,12 +702,12 @@ public long getNumKeyCommitFails() {
 
   @VisibleForTesting
   public long getNumBlockAllocates() {
-    return numAllocateBlockCalls.value();
+    return numBlockAllocations.value();
   }
 
   @VisibleForTesting
   public long getNumBlockAllocateFails() {
-    return numBlockAllocateCallFails.value();
+    return numBlockAllocationFails.value();
   }
 
   @VisibleForTesting