Skip to content

HDDS-12320. Introduce Metrics for deletekey operation for FSO in OM Service #7883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 4 commits into from
Mar 26, 2025
Merged

HDDS-12320. Introduce Metrics for deletekey operation for FSO in OM Service #7883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d643dd5
Add performance metrics for key delete operations in FSO
peterxcli Feb 15, 2025
989db77
Rename metrics variable to perfMetrics in TestOMKeyRequest
peterxcli Feb 15, 2025
b8f26ac
Merge remote-tracking branch 'origin/master' into hdds12320-add-metri…
adoroszlai Feb 17, 2025
2bbce5e
Merge remote-tracking branch 'upstream/master' into hdds12320-add-met…
peterxcli Mar 3, 2025
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
15 changes: 13 additions & 2 deletions ...nager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestWithFSO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.DIRECTORY_NOT_EMPTY;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_NOT_FOUND;
import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK;
import static org.apache.hadoop.ozone.util.MetricUtil.captureLatencyNs;

import java.io.IOException;
import java.nio.file.InvalidPathException;
Expand All @@ -33,6 +34,7 @@
import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OMMetrics;
import org.apache.hadoop.ozone.om.OMPerformanceMetrics;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.execution.flowcontrol.ExecutionContext;
Expand All @@ -51,6 +53,7 @@
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
import org.apache.hadoop.util.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -84,6 +87,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut

OMMetrics omMetrics = ozoneManager.getMetrics();
omMetrics.incNumKeyDeletes();
OMPerformanceMetrics perfMetrics = ozoneManager.getPerfMetrics();

AuditLogger auditLogger = ozoneManager.getAuditLogger();
OzoneManagerProtocolProtos.UserInfo userInfo = getOmRequest().getUserInfo();
Expand All @@ -96,6 +100,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut
OMClientResponse omClientResponse = null;
Result result = null;
OmBucketInfo omBucketInfo = null;
long startNanos = Time.monotonicNowNanos();
try {
mergeOmLockDetails(omMetadataManager.getLock()
.acquireWriteLock(BUCKET_LOCK, volumeName, bucketName));
Expand Down Expand Up @@ -184,11 +189,15 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut
omBucketInfo.copyObject(), keyStatus.isDirectory(), volumeId, deletedOpenKeyInfo);

result = Result.SUCCESS;
long endNanosDeleteKeySuccessLatencyNs = Time.monotonicNowNanos();
perfMetrics.setDeleteKeySuccessLatencyNs(endNanosDeleteKeySuccessLatencyNs - startNanos);
} catch (IOException | InvalidPathException ex) {
result = Result.FAILURE;
exception = ex;
omClientResponse = new OMKeyDeleteResponseWithFSO(
createErrorOMResponse(omResponse, exception), getBucketLayout());
long endNanosDeleteKeyFailureLatencyNs = Time.monotonicNowNanos();
perfMetrics.setDeleteKeyFailureLatencyNs(endNanosDeleteKeyFailureLatencyNs - startNanos);
} finally {
if (acquiredLock) {
mergeOmLockDetails(omMetadataManager.getLock()
Expand Down Expand Up @@ -228,7 +237,9 @@ protected OzoneManagerProtocolProtos.KeyArgs resolveBucketAndCheckAcls(
OzoneManager ozoneManager,
OzoneManagerProtocolProtos.KeyArgs.Builder newKeyArgs)
throws IOException {
return resolveBucketAndCheckKeyAclsWithFSO(newKeyArgs.build(),
ozoneManager, IAccessAuthorizer.ACLType.DELETE);
return captureLatencyNs(
ozoneManager.getPerfMetrics().getDeleteKeyResolveBucketAndAclCheckLatencyNs(),
() -> resolveBucketAndCheckKeyAclsWithFSO(newKeyArgs.build(),
ozoneManager, IAccessAuthorizer.ACLType.DELETE));
}
}
10 changes: 5 additions & 5 deletions .../ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public class TestOMKeyRequest {
protected OzoneBlockTokenSecretManager ozoneBlockTokenSecretManager;
protected ScmBlockLocationProtocol scmBlockLocationProtocol;
protected StorageContainerLocationProtocol scmContainerLocationProtocol;
protected OMPerformanceMetrics metrics;
protected OMPerformanceMetrics perfMetrics;
protected DeletingServiceMetrics delMetrics;

protected static final long CONTAINER_ID = 1000L;
Expand All @@ -137,7 +137,7 @@ public class TestOMKeyRequest {
public void setup() throws Exception {
ozoneManager = mock(OzoneManager.class);
omMetrics = OMMetrics.create();
metrics = OMPerformanceMetrics.register();
perfMetrics = OMPerformanceMetrics.register();
Copy link
Member Author

@peterxcli peterxcli Feb 15, 2025

Choose a reason for hiding this comment

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

Should we mock this and make some call verify on it?

delMetrics = DeletingServiceMetrics.create();
OzoneConfiguration ozoneConfiguration = getOzoneConfiguration();
ozoneConfiguration.set(OMConfigKeys.OZONE_OM_DB_DIRS,
Expand All @@ -149,7 +149,7 @@ public void setup() throws Exception {
omMetadataManager = new OmMetadataManagerImpl(ozoneConfiguration,
ozoneManager);
when(ozoneManager.getMetrics()).thenReturn(omMetrics);
when(ozoneManager.getPerfMetrics()).thenReturn(metrics);
when(ozoneManager.getPerfMetrics()).thenReturn(perfMetrics);
when(ozoneManager.getDeletionMetrics()).thenReturn(delMetrics);
when(ozoneManager.getMetadataManager()).thenReturn(omMetadataManager);
when(ozoneManager.getConfiguration()).thenReturn(ozoneConfiguration);
Expand All @@ -170,9 +170,9 @@ public void setup() throws Exception {
scmClient = mock(ScmClient.class);
ozoneBlockTokenSecretManager = mock(OzoneBlockTokenSecretManager.class);
scmBlockLocationProtocol = mock(ScmBlockLocationProtocol.class);
metrics = mock(OMPerformanceMetrics.class);
perfMetrics = mock(OMPerformanceMetrics.class);
keyManager = new KeyManagerImpl(ozoneManager, scmClient, ozoneConfiguration,
metrics);
perfMetrics);
when(ozoneManager.getScmClient()).thenReturn(scmClient);
when(ozoneManager.getBlockTokenSecretManager())
.thenReturn(ozoneBlockTokenSecretManager);
Expand Down