HDDS-2142. OM metrics mismatch (abort multipart request) (#1461)

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java

@@ -2834,7 +2834,7 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
           .LIST_MULTIPART_UPLOAD_PARTS, auditMap));
       return omMultipartUploadListParts;
     } catch (IOException ex) {
-      metrics.incNumAbortMultipartUploadFails();
+      metrics.incNumListMultipartUploadPartFails();
       AUDIT.logWriteFailure(buildAuditMessageForFailure(OMAction
           .LIST_MULTIPART_UPLOAD_PARTS, auditMap, ex));
       throw ex;

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequest.java

@@ -85,6 +85,7 @@ public class S3MultipartUploadAbortRequest extends OMKeyRequest {
     String bucketName = keyArgs.getBucketName();
     String keyName = keyArgs.getKeyName();
 
+    ozoneManager.getMetrics().incNumAbortMultipartUploads();
     OMMetadataManager omMetadataManager = ozoneManager.getMetadataManager();
     boolean acquiredLock = false;
     IOException exception = null;
@@ -157,7 +158,6 @@ public class S3MultipartUploadAbortRequest extends OMKeyRequest {
         OMAction.ABORT_MULTIPART_UPLOAD, buildKeyArgsAuditMap(keyArgs),
         exception, getOmRequest().getUserInfo()));
 
-
     if (exception == null) {
       LOG.debug("Abort Multipart request is successfully completed for " +
           "KeyName {} in VolumeName/Bucket {}/{}", keyName, volumeName,