Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Doroszlai, Attila 2019-09-18 02:27:08 +02:00 committed by Bharat Viswanadham
parent 3cf6e4272f
commit a9ba2b6710
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2834,7 +2834,7 @@ public OmMultipartUploadListParts listParts(String volumeName,
.LIST_MULTIPART_UPLOAD_PARTS, auditMap)); .LIST_MULTIPART_UPLOAD_PARTS, auditMap));
return omMultipartUploadListParts; return omMultipartUploadListParts;
} catch (IOException ex) { } catch (IOException ex) {
metrics.incNumAbortMultipartUploadFails(); metrics.incNumListMultipartUploadPartFails();
AUDIT.logWriteFailure(buildAuditMessageForFailure(OMAction AUDIT.logWriteFailure(buildAuditMessageForFailure(OMAction
.LIST_MULTIPART_UPLOAD_PARTS, auditMap, ex)); .LIST_MULTIPART_UPLOAD_PARTS, auditMap, ex));
throw ex; throw ex;

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

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