Skip to content

HDDS-7635. Update failure metrics when allocate block fails in preExecute. #4086

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
errose28 merged 1 commit into from
Dec 19, 2022
Merged

HDDS-7635. Update failure metrics when allocate block fails in preExecute. #4086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.rules.Timeout;
import org.mockito.Mockito;

Expand Down Expand Up @@ -316,8 +317,20 @@ public void testKeyOps() throws Exception {
writeClient.commitKey(keyArgs, keySession.getId());
writeClient.deleteKey(keyArgs);

keyArgs = createKeyArgs(volumeName, bucketName,
new ECReplicationConfig("rs-6-4-1024K"));
try {
keySession = writeClient.openKey(keyArgs);
writeClient.commitKey(keyArgs, keySession.getId());
} catch (Exception e) {
//Expected Failure in preExecute due to not enough datanode
Assertions.assertTrue(e.getMessage()
.contains("No enough datanodes to choose"));
}

omMetrics = getMetrics("OMMetrics");
assertCounter("NumKeys", 2L, omMetrics);
assertCounter("NumBlockAllocationFails", 1L, omMetrics);

// inject exception to test for Failure Metrics on the read path
Mockito.doThrow(exception).when(mockKm).lookupKey(any(), any());
Expand Down
3 changes: 2 additions & 1 deletion ...ne-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
new ExcludeList(), requestedSize, scmBlockSize,
ozoneManager.getPreallocateBlocksMax(),
ozoneManager.isGrpcBlockTokenEnabled(),
ozoneManager.getOMNodeId());
ozoneManager.getOMNodeId(),
ozoneManager.getMetrics());

KeyArgs.Builder newKeyArgs = keyArgs.toBuilder()
.setModificationTime(Time.now()).setType(type).setFactor(factor)
Expand Down
3 changes: 2 additions & 1 deletion ...-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
ozoneManager.getBlockTokenSecretManager(), repConfig, excludeList,
ozoneManager.getScmBlockSize(), ozoneManager.getScmBlockSize(),
ozoneManager.getPreallocateBlocksMax(),
ozoneManager.isGrpcBlockTokenEnabled(), ozoneManager.getOMNodeId());
ozoneManager.isGrpcBlockTokenEnabled(), ozoneManager.getOMNodeId(),
ozoneManager.getMetrics());

// Set modification time and normalize key if required.
KeyArgs.Builder newKeyArgs =
Expand Down
3 changes: 2 additions & 1 deletion ...zone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
new ExcludeList(), requestedSize, scmBlockSize,
ozoneManager.getPreallocateBlocksMax(),
ozoneManager.isGrpcBlockTokenEnabled(),
ozoneManager.getOMNodeId());
ozoneManager.getOMNodeId(),
ozoneManager.getMetrics());

newKeyArgs = keyArgs.toBuilder().setModificationTime(Time.now())
.setType(type).setFactor(factor)
Expand Down
5 changes: 4 additions & 1 deletion ...zone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.om.OMMetrics;
import org.apache.hadoop.ozone.om.PrefixManager;
import org.apache.hadoop.ozone.om.ResolvedBucket;
import org.apache.hadoop.ozone.om.helpers.BucketEncryptionKeyInfo;
Expand Down Expand Up @@ -134,7 +135,8 @@ protected List< OmKeyLocationInfo > allocateBlock(ScmClient scmClient,
OzoneBlockTokenSecretManager secretManager,
ReplicationConfig replicationConfig, ExcludeList excludeList,
long requestedSize, long scmBlockSize, int preallocateBlocksMax,
boolean grpcBlockTokenEnabled, String omID) throws IOException {
boolean grpcBlockTokenEnabled, String omID, OMMetrics omMetrics)
throws IOException {
int dataGroupSize = replicationConfig instanceof ECReplicationConfig
? ((ECReplicationConfig) replicationConfig).getData() : 1;
int numBlocks = (int) Math.min(preallocateBlocksMax,
Expand All @@ -148,6 +150,7 @@ protected List< OmKeyLocationInfo > allocateBlock(ScmClient scmClient,
.allocateBlock(scmBlockSize, numBlocks, replicationConfig, omID,
excludeList);
} catch (SCMException ex) {
omMetrics.incNumBlockAllocateCallFails();
if (ex.getResult()
.equals(SCMException.ResultCodes.SAFE_MODE_EXCEPTION)) {
throw new OMException(ex.getMessage(),
Expand Down