diff --git a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OM Overview.json b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OM Overview.json index 803711e28ec..5dce95b969c 100644 --- a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OM Overview.json +++ b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - OM Overview.json @@ -1294,7 +1294,7 @@ "datasource": { "type": "prometheus" }, - "description": "**Paired legends** match **Buckets & layouts — rate** (seven series). OBS+FSO create/delete **`om_metrics`** rows are summed on the rate side. **`service list`** is **OmClient ServiceList RPC** (**`om_client_protocol_*`** rate/latency), not **`om_metrics_num_bucket_s3_lists`** (that counter has no callers in OM). **`GetS3VolumeContext`** likewise uses **`om_client_protocol_*`**.", + "description": "**Paired legends** match **Buckets & layouts — rate** (seven series). OBS+FSO create/delete **`om_metrics`** rows are summed on the rate side. **`service list`** is **OmClient ServiceList RPC** (**`om_client_protocol_*`** rate/latency). **`GetS3VolumeContext`** likewise uses **`om_client_protocol_*`**.", "fieldConfig": { "defaults": { "color": { diff --git a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Overall Metrics.json b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Overall Metrics.json index 825fc0a257d..c3519ee5309 100644 --- a/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Overall Metrics.json +++ b/hadoop-ozone/dist/src/main/compose/common/grafana/dashboards/Ozone - Overall Metrics.json @@ -183,91 +183,6 @@ "x": 0, "y": 10 }, - "id": 68, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom" - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "8.4.2", - "targets": [ - { - "datasource": { - "type": "prometheus" - }, - "exemplar": true, - "expr": "om_metrics_num_s3_buckets", - "interval": "", - "legendFormat": "", - "refId": "A" - } - ], - "title": "om_metrics_num_s3_buckets", - "type": "timeseries" - }, - { - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 8, - "x": 8, - "y": 10 - }, "id": 262, "options": { "legend": { @@ -350,7 +265,7 @@ "gridPos": { "h": 8, "w": 8, - "x": 16, + "x": 8, "y": 10 }, "id": 263, diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java index ff74e6b6e67..f62371ed1a0 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java @@ -55,7 +55,6 @@ public class OMMetrics implements OmMetadataReaderMetrics { private @Metric MutableCounterLong numVolumeCreates; private @Metric MutableCounterLong numVolumeUpdates; private @Metric MutableCounterLong numVolumeInfos; - private @Metric MutableCounterLong numVolumeCheckAccesses; private @Metric MutableCounterLong numBucketCreates; private @Metric MutableCounterLong numFSOBucketCreates; private @Metric MutableCounterLong numVolumeDeletes; @@ -76,7 +75,6 @@ public class OMMetrics implements OmMetadataReaderMetrics { private @Metric MutableCounterLong numKeyHSyncs; private @Metric MutableCounterLong numBlockAllocations; private @Metric MutableCounterLong numGetServiceLists; - private @Metric MutableCounterLong numBucketS3Lists; private @Metric MutableCounterLong numInitiateMultipartUploads; private @Metric MutableCounterLong numCompleteMultipartUploads; private @Metric MutableCounterLong numSnapshotCreates; @@ -131,7 +129,6 @@ public class OMMetrics implements OmMetadataReaderMetrics { private @Metric MutableCounterLong numVolumeInfoFails; private @Metric MutableCounterLong numVolumeDeleteFails; private @Metric MutableCounterLong numBucketCreateFails; - private @Metric MutableCounterLong numVolumeCheckAccessFails; private @Metric MutableCounterLong numBucketInfoFails; private @Metric MutableCounterLong numBucketUpdateFails; private @Metric MutableCounterLong numBucketDeleteFails; @@ -146,8 +143,6 @@ public class OMMetrics implements OmMetadataReaderMetrics { private @Metric MutableCounterLong numVolumeListFails; private @Metric MutableCounterLong numKeyCommitFails; private @Metric MutableCounterLong numBlockAllocationFails; - private @Metric MutableCounterLong numGetServiceListFails; - private @Metric MutableCounterLong numBucketS3ListFails; private @Metric MutableCounterLong numInitiateMultipartUploadFails; private @Metric MutableCounterLong numCommitMultipartUploadParts; private @Metric MutableCounterLong numCommitMultipartUploadPartFails; @@ -222,18 +217,12 @@ public class OMMetrics implements OmMetadataReaderMetrics { private @Metric MutableGaugeLong numVolumes; private @Metric MutableGaugeLong numBuckets; - private @Metric MutableCounterLong numS3Buckets; //TODO: This metric is an estimate and it may be inaccurate on restart if the // OM process was not shutdown cleanly. Key creations/deletions in the last // few minutes before restart may not be included in this count. private @Metric MutableGaugeLong numKeys; - private @Metric MutableCounterLong numBucketS3Creates; - private @Metric MutableCounterLong numBucketS3CreateFails; - private @Metric MutableCounterLong numBucketS3Deletes; - private @Metric MutableCounterLong numBucketS3DeleteFails; - private @Metric MutableCounterLong numListMultipartUploadFails; private @Metric MutableCounterLong numListMultipartUploads; @@ -241,7 +230,6 @@ public class OMMetrics implements OmMetadataReaderMetrics { private @Metric MutableCounterLong numTrashRenames; private @Metric MutableCounterLong numTrashDeletes; private @Metric MutableCounterLong numTrashListStatus; - private @Metric MutableCounterLong numTrashListKeys; private @Metric MutableCounterLong numTrashGetFileStatus; private @Metric MutableCounterLong numTrashGetTrashRoots; private @Metric MutableCounterLong numTrashExists; @@ -249,7 +237,6 @@ public class OMMetrics implements OmMetadataReaderMetrics { private @Metric MutableCounterLong numTrashFilesRenames; private @Metric MutableCounterLong numTrashFilesDeletes; private @Metric MutableCounterLong numTrashActiveCycles; - private @Metric MutableCounterLong numTrashCheckpointsProcessed; private @Metric MutableCounterLong numTrashFails; private @Metric MutableCounterLong numTrashRootsEnqueued; private @Metric MutableCounterLong numTrashRootsProcessed; @@ -318,37 +305,10 @@ public void stopSnapshotDirectoryMetrics() { } } - public void incNumS3BucketCreates() { - numBucketOps.incr(); - numBucketS3Creates.incr(); - } - - public void incNumS3BucketCreateFails() { - numBucketS3CreateFails.incr(); - } - - public void incNumS3BucketDeletes() { - numBucketOps.incr(); - numBucketS3Deletes.incr(); - } - - public void incNumS3BucketDeleteFails() { - numBucketOps.incr(); - numBucketS3DeleteFails.incr(); - } - public void incDataCommittedBytes(long bytesWritten) { totalDataCommitted.incr(bytesWritten); } - public void incNumS3Buckets() { - numS3Buckets.incr(); - } - - public void decNumS3Buckets() { - numS3Buckets.incr(); - } - public void incNumVolumes() { numVolumes.incr(); } @@ -433,11 +393,6 @@ public void incNumVolumeDeletes() { numVolumeDeletes.incr(); } - public void incNumVolumeCheckAccesses() { - numVolumeOps.incr(); - numVolumeCheckAccesses.incr(); - } - public void incNumBucketCreates() { numBucketOps.incr(); numBucketCreates.incr(); @@ -482,15 +437,6 @@ public void incNumVolumeLists() { numVolumeLists.incr(); } - public void incNumListS3Buckets() { - numBucketOps.incr(); - numBucketS3Lists.incr(); - } - - public void incNumListS3BucketsFails() { - numBucketS3ListFails.incr(); - } - public void incNumListOpenFiles() { numKeyOps.incr(); numListOpenFiles.incr(); @@ -609,10 +555,6 @@ public void incNumSnapshotDeleted() { numSnapshotDeleted.incr(); } - public void decNumSnapshotDeleted() { - numSnapshotDeleted.incr(-1); - } - public int getNumSnapshotCacheSize() { return numSnapshotCacheSize.value(); } @@ -809,10 +751,6 @@ public void incNumVolumeDeleteFails() { numVolumeDeleteFails.incr(); } - public void incNumVolumeCheckAccessFails() { - numVolumeCheckAccessFails.incr(); - } - public void incNumBucketCreateFails() { numBucketCreateFails.incr(); } @@ -933,10 +871,6 @@ public void incNumVolumeListFails() { numVolumeListFails.incr(); } - public void incNumGetServiceListFails() { - numGetServiceListFails.incr(); - } - public void incNumOpenKeyDeleteRequests() { numOpenKeyDeleteRequests.incr(); } @@ -1102,11 +1036,6 @@ public long getNumVolumeDeletes() { return numVolumeDeletes.value(); } - @VisibleForTesting - public long getNumVolumeCheckAccesses() { - return numVolumeCheckAccesses.value(); - } - @VisibleForTesting public long getNumBucketCreates() { return numBucketCreates.value(); @@ -1177,11 +1106,6 @@ public long getNumVolumeDeleteFails() { return numVolumeDeleteFails.value(); } - @VisibleForTesting - public long getNumVolumeCheckAccessFails() { - return numVolumeCheckAccessFails.value(); - } - @VisibleForTesting public long getNumBucketCreateFails() { return numBucketCreateFails.value(); @@ -1322,21 +1246,6 @@ public long getNumBlockAllocateFails() { return numBlockAllocationFails.value(); } - @VisibleForTesting - public long getNumGetServiceListFails() { - return numGetServiceListFails.value(); - } - - @VisibleForTesting - public long getNumListS3Buckets() { - return numBucketS3Lists.value(); - } - - @VisibleForTesting - public long getNumListS3BucketsFails() { - return numBucketS3ListFails.value(); - } - @VisibleForTesting public long getDataCommittedBytes() { return totalDataCommitted.value(); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java index 9b22579ec09..ea40c80566a 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java @@ -3935,10 +3935,6 @@ public List getServiceList() throws IOException { services.add(scmServiceInfoBuilder.build()); } metrics.incNumGetServiceLists(); - // For now there is no exception that can can happen in this call, - // so failure metrics is not handled. In future if there is any need to - // handle exception in this method, we need to incorporate - // metrics.incNumGetServiceListFails() AUDIT.logReadSuccess( buildAuditMessageForSuccess(OMAction.GET_SERVICE_LIST, new LinkedHashMap<>()));