-
Notifications
You must be signed in to change notification settings - Fork 625
HDDS-11444. Make Datanode Command metrics consistent across all commands #7191
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.
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
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
139 changes: 139 additions & 0 deletions
139
...ntainer/common/statemachine/commandhandler/TestReconstructECContainersCommandHandler.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with this | ||
| * work for additional information regarding copyright ownership. The ASF | ||
| * licenses this file to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * <p> | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations under | ||
| * the License. | ||
| */ | ||
| package org.apache.hadoop.ozone.container.common.statemachine.commandhandler; | ||
|
|
||
| import com.google.protobuf.ByteString; | ||
| import com.google.protobuf.Proto2Utils; | ||
| import org.apache.hadoop.hdds.client.ECReplicationConfig; | ||
| import org.apache.hadoop.hdds.conf.OzoneConfiguration; | ||
| import org.apache.hadoop.hdds.protocol.DatanodeDetails; | ||
| import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; | ||
| import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMCommandProto; | ||
| import org.apache.hadoop.metrics2.impl.MetricsCollectorImpl; | ||
| import org.apache.hadoop.ozone.container.common.helpers.CommandHandlerMetrics; | ||
| import org.apache.hadoop.ozone.container.common.statemachine.SCMConnectionManager; | ||
| import org.apache.hadoop.ozone.container.common.statemachine.StateContext; | ||
| import org.apache.hadoop.ozone.container.ec.reconstruction.ECReconstructionCoordinator; | ||
| import org.apache.hadoop.ozone.container.ec.reconstruction.ECReconstructionCoordinatorTask; | ||
| import org.apache.hadoop.ozone.container.ozoneimpl.OzoneContainer; | ||
| import org.apache.hadoop.ozone.container.replication.ReplicationSupervisor; | ||
| import org.apache.hadoop.ozone.protocol.commands.ReconstructECContainersCommand; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.mockito.ArgumentMatchers.any; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.doNothing; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| /** | ||
| * Test cases to verify {@link ReconstructECContainersCommandHandler}. | ||
| */ | ||
| public class TestReconstructECContainersCommandHandler { | ||
| private OzoneConfiguration conf; | ||
| private ReplicationSupervisor supervisor; | ||
| private ECReconstructionCoordinator coordinator; | ||
| private OzoneContainer ozoneContainer; | ||
| private StateContext stateContext; | ||
| private SCMConnectionManager connectionManager; | ||
|
|
||
| @BeforeEach | ||
| public void setUp() { | ||
| supervisor = mock(ReplicationSupervisor.class); | ||
| coordinator = mock(ECReconstructionCoordinator.class); | ||
| conf = new OzoneConfiguration(); | ||
| ozoneContainer = mock(OzoneContainer.class); | ||
| connectionManager = mock(SCMConnectionManager.class); | ||
| stateContext = mock(StateContext.class); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMetrics() { | ||
| ReconstructECContainersCommandHandler commandHandler = | ||
| new ReconstructECContainersCommandHandler(conf, supervisor, coordinator); | ||
| doNothing().when(supervisor).addTask(any()); | ||
| Map<SCMCommandProto.Type, CommandHandler> handlerMap = new HashMap<>(); | ||
| handlerMap.put(commandHandler.getCommandType(), commandHandler); | ||
| CommandHandlerMetrics metrics = CommandHandlerMetrics.create(handlerMap); | ||
| try { | ||
| byte[] missingIndexes = {1, 2}; | ||
| ByteString missingContainerIndexes = Proto2Utils.unsafeByteString(missingIndexes); | ||
| ECReplicationConfig ecReplicationConfig = new ECReplicationConfig(3, 2); | ||
| List<DatanodeDetails> dnDetails = getDNDetails(5); | ||
| List<ReconstructECContainersCommand.DatanodeDetailsAndReplicaIndex> sources = | ||
| dnDetails.stream().map(a -> new ReconstructECContainersCommand | ||
| .DatanodeDetailsAndReplicaIndex(a, dnDetails.indexOf(a))) | ||
| .collect(Collectors.toList()); | ||
| List<DatanodeDetails> targets = getDNDetails(2); | ||
| ReconstructECContainersCommand reconstructECContainersCommand = | ||
| new ReconstructECContainersCommand(1L, sources, targets, | ||
| missingContainerIndexes, ecReplicationConfig); | ||
|
|
||
| commandHandler.handle(reconstructECContainersCommand, ozoneContainer, | ||
| stateContext, connectionManager); | ||
| String metricsName = "ECReconstructions"; | ||
| assertEquals(commandHandler.getMetricsName(), metricsName); | ||
| when(supervisor.getReplicationRequestCount(metricsName)).thenReturn(1L); | ||
| assertEquals(commandHandler.getInvocationCount(), 1); | ||
|
|
||
| commandHandler.handle(new ReconstructECContainersCommand(2L, sources, | ||
| targets, missingContainerIndexes, ecReplicationConfig), ozoneContainer, | ||
| stateContext, connectionManager); | ||
| commandHandler.handle(new ReconstructECContainersCommand(3L, sources, | ||
| targets, missingContainerIndexes, ecReplicationConfig), ozoneContainer, | ||
| stateContext, connectionManager); | ||
| commandHandler.handle(new ReconstructECContainersCommand(4L, sources, | ||
| targets, missingContainerIndexes, ecReplicationConfig), ozoneContainer, | ||
| stateContext, connectionManager); | ||
| commandHandler.handle(new ReconstructECContainersCommand(5L, sources, | ||
| targets, missingContainerIndexes, ecReplicationConfig), ozoneContainer, | ||
| stateContext, connectionManager); | ||
| commandHandler.handle(new ReconstructECContainersCommand(6L, sources, | ||
| targets, missingContainerIndexes, ecReplicationConfig), ozoneContainer, | ||
| stateContext, connectionManager); | ||
|
|
||
| when(supervisor.getReplicationRequestCount(metricsName)).thenReturn(5L); | ||
| when(supervisor.getReplicationRequestTotalTime(metricsName)).thenReturn(10L); | ||
| when(supervisor.getInFlightReplications(ECReconstructionCoordinatorTask.class)) | ||
| .thenReturn(1); | ||
| assertEquals(commandHandler.getInvocationCount(), 5); | ||
| assertEquals(commandHandler.getQueuedCount(), 1); | ||
| assertEquals(commandHandler.getTotalRunTime(), 10); | ||
|
|
||
| MetricsCollectorImpl metricsCollector = new MetricsCollectorImpl(); | ||
| metrics.getMetrics(metricsCollector, true); | ||
| assertEquals(1, metricsCollector.getRecords().size()); | ||
| } finally { | ||
| metrics.unRegister(); | ||
| } | ||
| } | ||
|
|
||
| private List<DatanodeDetails> getDNDetails(int numDns) { | ||
| List<DatanodeDetails> dns = new ArrayList<>(); | ||
| for (int i = 0; i < numDns; i++) { | ||
| dns.add(MockDatanodeDetails.randomDatanodeDetails()); | ||
| } | ||
| return dns; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we add queued count here as well? The replication supervisor already has this information, but it is exposed via the individual commands instead. It might be more intuitive to have it here as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @errose28 for the comment and review.
I will update it later.
Right now, taskCounter records the number of queues.
I will add the QueueCount metric to ReplicationSupervisorMetrics later.
In addition, I suggest improving taskCounter so that it is consistent with requestCounter and successCounter.
What do you think?