Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -350,7 +265,7 @@
"gridPos": {
"h": 8,
"w": 8,
"x": 16,
"x": 8,
"y": 10
},
"id": 263,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,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;
Expand All @@ -75,7 +74,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;
Expand Down Expand Up @@ -130,7 +128,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;
Expand All @@ -146,7 +143,6 @@ public class OMMetrics implements OmMetadataReaderMetrics {
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;
Expand Down Expand Up @@ -221,34 +217,25 @@ public class OMMetrics implements OmMetadataReaderMetrics {

private @Metric MutableCounterLong numVolumes;
private @Metric MutableCounterLong 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 MutableCounterLong 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;

// Metrics related to OM Trash.
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;
private @Metric MutableCounterLong numTrashWriteRequests;
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;
Expand Down Expand Up @@ -317,37 +304,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();
}
Expand Down Expand Up @@ -437,11 +397,6 @@ public void incNumVolumeDeletes() {
numVolumeDeletes.incr();
}

public void incNumVolumeCheckAccesses() {
numVolumeOps.incr();
numVolumeCheckAccesses.incr();
}

public void incNumBucketCreates() {
numBucketOps.incr();
numBucketCreates.incr();
Expand Down Expand Up @@ -486,15 +441,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();
Expand Down Expand Up @@ -813,10 +759,6 @@ public void incNumVolumeDeleteFails() {
numVolumeDeleteFails.incr();
}

public void incNumVolumeCheckAccessFails() {
numVolumeCheckAccessFails.incr();
}

public void incNumBucketCreateFails() {
numBucketCreateFails.incr();
}
Expand Down Expand Up @@ -1106,11 +1048,6 @@ public long getNumVolumeDeletes() {
return numVolumeDeletes.value();
}

@VisibleForTesting
public long getNumVolumeCheckAccesses() {
return numVolumeCheckAccesses.value();
}

@VisibleForTesting
public long getNumBucketCreates() {
return numBucketCreates.value();
Expand Down Expand Up @@ -1181,11 +1118,6 @@ public long getNumVolumeDeleteFails() {
return numVolumeDeleteFails.value();
}

@VisibleForTesting
public long getNumVolumeCheckAccessFails() {
return numVolumeCheckAccessFails.value();
}

@VisibleForTesting
public long getNumBucketCreateFails() {
return numBucketCreateFails.value();
Expand Down Expand Up @@ -1331,16 +1263,6 @@ public long getNumGetServiceListFails() {
return numGetServiceListFails.value();

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like this can be removed as well?

}

@VisibleForTesting
public long getNumListS3Buckets() {
return numBucketS3Lists.value();
}

@VisibleForTesting
public long getNumListS3BucketsFails() {
return numBucketS3ListFails.value();
}

@VisibleForTesting
public long getDataCommittedBytes() {
return totalDataCommitted.value();
Expand Down Expand Up @@ -1555,10 +1477,6 @@ public void incNumTrashListStatus() {
numTrashListStatus.incr();
}

public void incNumTrashGetFileStatus() {
numTrashGetFileStatus.incr();
}

public void incNumTrashGetTrashRoots() {
numTrashGetTrashRoots.incr();
}
Expand Down