Skip to content

Commit 27e388f

Browse files
committed
Ensure consistency of metrics names
Also remove unused callback in the mongodb foreach Issue: S3UTILS-186
1 parent 8ab689d commit 27e388f

File tree

6 files changed

+119
-145
lines changed

6 files changed

+119
-145
lines changed

CountItems/utils/utils.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function consolidateDataMetrics(target, source) {
3333
_currentRestoring: 0,
3434
_nonCurrentRestored: 0,
3535
_nonCurrentRestoring: 0,
36-
_incompleteMPUParts: 0,
36+
_incompleteMPUUploads: 0,
3737
deleteMarker: 0,
3838
},
3939
});
@@ -61,7 +61,7 @@ function consolidateDataMetrics(target, source) {
6161
resTarget.objectCount._currentRestored += objectCount && objectCount._currentRestored ? objectCount._currentRestored : 0;
6262
resTarget.objectCount._nonCurrentRestoring += objectCount && objectCount._nonCurrentRestoring ? objectCount._nonCurrentRestoring : 0;
6363
resTarget.objectCount._nonCurrentRestored += objectCount && objectCount._nonCurrentRestored ? objectCount._nonCurrentRestored : 0;
64-
resTarget.objectCount._incompleteMPUParts += objectCount && objectCount._incompleteMPUParts ? objectCount._incompleteMPUParts : 0;
64+
resTarget.objectCount._incompleteMPUUploads += objectCount && objectCount._incompleteMPUUploads ? objectCount._incompleteMPUUploads : 0;
6565

6666
resTarget.usedCapacity._inflightsPreScan += usedCapacity && usedCapacity._inflightsPreScan ? usedCapacity._inflightsPreScan : 0;
6767
if (accountOwnerID) {
@@ -75,7 +75,7 @@ function consolidateDataMetrics(target, source) {
7575
? usedCapacity._nonCurrentCold + usedCapacity._nonCurrentRestored + usedCapacity._nonCurrentRestoring : 0;
7676
resTarget.objectCount.current += objectCount
7777
? objectCount._currentCold + objectCount._currentRestored + objectCount._currentRestoring
78-
+ objectCount._incompleteMPUParts : 0;
78+
+ objectCount._incompleteMPUUploads : 0;
7979
resTarget.objectCount.nonCurrent += objectCount
8080
? objectCount._nonCurrentCold + objectCount._nonCurrentRestored + objectCount._nonCurrentRestoring : 0;
8181

0 commit comments

Comments
 (0)