HDDS-2138. OM bucket operations do not add up

Closes #1468
This commit is contained in:
Doroszlai, Attila 2019-09-18 15:23:27 +02:00 committed by Márton Elek
parent 419dd0faf6
commit 087ed86bcc
No known key found for this signature in database
GPG Key ID: D51EA8F00EE79B28

View File

@ -62,7 +62,7 @@ public class OMMetrics {
private @Metric MutableCounterLong numKeyCommits; private @Metric MutableCounterLong numKeyCommits;
private @Metric MutableCounterLong numBlockAllocations; private @Metric MutableCounterLong numBlockAllocations;
private @Metric MutableCounterLong numGetServiceLists; private @Metric MutableCounterLong numGetServiceLists;
private @Metric MutableCounterLong numListS3Buckets; private @Metric MutableCounterLong numBucketS3Lists;
private @Metric MutableCounterLong numInitiateMultipartUploads; private @Metric MutableCounterLong numInitiateMultipartUploads;
private @Metric MutableCounterLong numCompleteMultipartUploads; private @Metric MutableCounterLong numCompleteMultipartUploads;
@ -92,7 +92,7 @@ public class OMMetrics {
private @Metric MutableCounterLong numKeyCommitFails; private @Metric MutableCounterLong numKeyCommitFails;
private @Metric MutableCounterLong numBlockAllocationFails; private @Metric MutableCounterLong numBlockAllocationFails;
private @Metric MutableCounterLong numGetServiceListFails; private @Metric MutableCounterLong numGetServiceListFails;
private @Metric MutableCounterLong numListS3BucketsFails; private @Metric MutableCounterLong numBucketS3ListFails;
private @Metric MutableCounterLong numInitiateMultipartUploadFails; private @Metric MutableCounterLong numInitiateMultipartUploadFails;
private @Metric MutableCounterLong numCommitMultipartUploadParts; private @Metric MutableCounterLong numCommitMultipartUploadParts;
private @Metric MutableCounterLong numCommitMultipartUploadPartFails; private @Metric MutableCounterLong numCommitMultipartUploadPartFails;
@ -126,10 +126,10 @@ public class OMMetrics {
private @Metric MutableGaugeLong lastCheckpointTarOperationTimeTaken; private @Metric MutableGaugeLong lastCheckpointTarOperationTimeTaken;
private @Metric MutableGaugeLong lastCheckpointStreamingTimeTaken; private @Metric MutableGaugeLong lastCheckpointStreamingTimeTaken;
private @Metric MutableCounterLong numS3BucketCreates; private @Metric MutableCounterLong numBucketS3Creates;
private @Metric MutableCounterLong numS3BucketCreateFails; private @Metric MutableCounterLong numBucketS3CreateFails;
private @Metric MutableCounterLong numS3BucketDeletes; private @Metric MutableCounterLong numBucketS3Deletes;
private @Metric MutableCounterLong numS3BucketDeleteFails; private @Metric MutableCounterLong numBucketS3DeleteFails;
public OMMetrics() { public OMMetrics() {
@ -144,21 +144,21 @@ public static OMMetrics create() {
public void incNumS3BucketCreates() { public void incNumS3BucketCreates() {
numBucketOps.incr(); numBucketOps.incr();
numS3BucketCreates.incr(); numBucketS3Creates.incr();
} }
public void incNumS3BucketCreateFails() { public void incNumS3BucketCreateFails() {
numS3BucketCreateFails.incr(); numBucketS3CreateFails.incr();
} }
public void incNumS3BucketDeletes() { public void incNumS3BucketDeletes() {
numBucketOps.incr(); numBucketOps.incr();
numS3BucketDeletes.incr(); numBucketS3Deletes.incr();
} }
public void incNumS3BucketDeleteFails() { public void incNumS3BucketDeleteFails() {
numBucketOps.incr(); numBucketOps.incr();
numS3BucketDeleteFails.incr(); numBucketS3DeleteFails.incr();
} }
@ -284,12 +284,12 @@ public void incNumVolumeLists() {
public void incNumListS3Buckets() { public void incNumListS3Buckets() {
numBucketOps.incr(); numBucketOps.incr();
numListS3Buckets.incr(); numBucketS3Lists.incr();
} }
public void incNumListS3BucketsFails() { public void incNumListS3BucketsFails() {
numBucketOps.incr(); numBucketOps.incr();
numListS3BucketsFails.incr(); numBucketS3ListFails.incr();
} }
public void incNumInitiateMultipartUploads() { public void incNumInitiateMultipartUploads() {
@ -717,12 +717,12 @@ public long getNumGetServiceListFails() {
@VisibleForTesting @VisibleForTesting
public long getNumListS3Buckets() { public long getNumListS3Buckets() {
return numListS3Buckets.value(); return numBucketS3Lists.value();
} }
@VisibleForTesting @VisibleForTesting
public long getNumListS3BucketsFails() { public long getNumListS3BucketsFails() {
return numListS3BucketsFails.value(); return numBucketS3ListFails.value();
} }
public long getNumInitiateMultipartUploads() { public long getNumInitiateMultipartUploads() {