From f22818d0d6147cbaea3cf1b043fc3f1cc4932e88 Mon Sep 17 00:00:00 2001 From: Bharat Viswanadham Date: Thu, 18 Jul 2019 09:36:15 -0700 Subject: [PATCH] HDDS-1820. Fix numKeys metrics in OM HA. (#1116) --- .../ozone/om/request/key/OMKeyCommitRequest.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java index 678dfc99ff0..a98a9fac889 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java @@ -178,6 +178,17 @@ public class OMKeyCommitRequest extends OMKeyRequest { // return response after releasing lock. if (exception == null) { omResponse.setCommitKeyResponse(CommitKeyResponse.newBuilder().build()); + + // As when we commit the key, then it is visible in ozone, so we should + // increment here. + // As key also can have multiple versions, we need to increment keys + // only if version is 0. Currently we have not complete support of + // versioning of keys. So, this can be revisited later. + + if (omKeyInfo.getKeyLocationVersions().size() == 1) { + omMetrics.incNumKeys(); + } + return new OMKeyCommitResponse(omKeyInfo, commitKeyRequest.getClientID(), omResponse.build()); } else {