myskov commented on code in PR #7139: URL: https://github.com/apache/ozone/pull/7139#discussion_r1849638991
########## hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/util/TestDurationUtil.java: ########## @@ -0,0 +1,93 @@ +/* + * 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.hdds.util; + +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.time.Duration; +import java.util.Arrays; +import java.util.Collection; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.params.provider.Arguments.arguments; + +class TestDurationUtil { + + private static Stream<Arguments> paramsForPositiveCases() { + return Stream.of( + arguments( + "0s", + DurationUtil.getPrettyDuration(Duration.ZERO) Review Comment: let's pass arguments(String, Duration), without repeated "DurationUtil.getPrettyDuration" on every line for better readability ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerStatusInfo.java: ########## @@ -48,14 +55,262 @@ void testGetIterationStatistics() { ContainerBalancerTask task = mockedScm.startBalancerTask(config); List<ContainerBalancerTaskIterationStatusInfo> iterationStatistics = task.getCurrentIterationsStatistic(); assertEquals(3, iterationStatistics.size()); - iterationStatistics.forEach(is -> { - assertTrue(is.getContainerMovesCompleted() > 0); - assertEquals(0, is.getContainerMovesFailed()); - assertEquals(0, is.getContainerMovesTimeout()); - assertFalse(is.getSizeEnteringNodesGB().isEmpty()); - assertFalse(is.getSizeLeavingNodesGB().isEmpty()); + + ContainerBalancerTaskIterationStatusInfo iterationHistory1 = iterationStatistics.get(0); + verifyCompletedIteration(iterationHistory1, 1); + + ContainerBalancerTaskIterationStatusInfo iterationHistory2 = iterationStatistics.get(1); + verifyCompletedIteration(iterationHistory2, 2); + + ContainerBalancerTaskIterationStatusInfo currentIteration = iterationStatistics.get(2); + verifyEmptyIteration(currentIteration); + } + + @Test + void testReRequestIterationStatistics() throws InterruptedException { + MockedSCM mockedScm = new MockedSCM(new TestableCluster(20, OzoneConsts.GB)); + + ContainerBalancerConfiguration config = new OzoneConfiguration().getObject(ContainerBalancerConfiguration.class); + + config.setIterations(2); + config.setBalancingInterval(0); + config.setMaxSizeToMovePerIteration(50 * OzoneConsts.GB); + + ContainerBalancerTask task = mockedScm.startBalancerTask(config); + List<ContainerBalancerTaskIterationStatusInfo> firstRequestIterationStatistics = + task.getCurrentIterationsStatistic(); + Thread.sleep(1000L); + List<ContainerBalancerTaskIterationStatusInfo> secondRequestIterationStatistics = + task.getCurrentIterationsStatistic(); + assertEquals(firstRequestIterationStatistics.get(0), secondRequestIterationStatistics.get(0)); + assertEquals(firstRequestIterationStatistics.get(1), secondRequestIterationStatistics.get(1)); + + assertEquals(firstRequestIterationStatistics.get(2).getIterationNumber(), + secondRequestIterationStatistics.get(2).getIterationNumber()); + assertNotEquals(firstRequestIterationStatistics.get(2).getIterationDuration(), + secondRequestIterationStatistics.get(2).getIterationDuration()); + } + + @Test + void testGetCurrentStatisticsRequestInPeriodBetweenIterations() throws Exception { + MockedSCM mockedScm = new MockedSCM(new TestableCluster(20, OzoneConsts.GB)); + + ContainerBalancerConfiguration config = new OzoneConfiguration().getObject(ContainerBalancerConfiguration.class); + + config.setIterations(2); + config.setBalancingInterval(10000); + config.setMaxSizeToMovePerIteration(50 * OzoneConsts.GB); + + ContainerBalancerTask task = mockedScm.startBalancerTaskAsync(config, false); + // Delay in finishing the first iteration + LambdaTestUtils.await(1000, 500, () -> task.getCurrentIterationsStatistic().size() == 2); + List<ContainerBalancerTaskIterationStatusInfo> iterationsStatic = task.getCurrentIterationsStatistic(); + assertEquals(2, iterationsStatic.size()); + + ContainerBalancerTaskIterationStatusInfo firstIteration = iterationsStatic.get(0); + verifyCompletedIteration(firstIteration, 1); + + assertEquals(0, iterationsStatic.get(1).getIterationNumber()); + assertTrue(iterationsStatic.get(1).getIterationDuration() > 0); + assertNull(iterationsStatic.get(1).getIterationResult()); + assertEquals(0, iterationsStatic.get(1).getContainerMovesScheduled()); + assertEquals(0, iterationsStatic.get(1).getContainerMovesCompleted()); + assertEquals(0, iterationsStatic.get(1).getContainerMovesFailed()); + assertEquals(0, iterationsStatic.get(1).getContainerMovesTimeout()); + assertEquals(0, iterationsStatic.get(1).getSizeScheduledForMove()); + assertEquals(0, iterationsStatic.get(1).getDataSizeMoved()); + assertEquals(0, iterationsStatic.get(1).getSizeEnteringNodes().size()); + assertEquals(0, iterationsStatic.get(1).getSizeLeavingNodes().size()); + } + + @Test + void testCurrentStatisticsDoesntChangeWhenReRequestInPeriodBetweenIterations() throws InterruptedException { + MockedSCM mockedScm = new MockedSCM(new TestableCluster(20, OzoneConsts.GB)); + + ContainerBalancerConfiguration config = new OzoneConfiguration().getObject(ContainerBalancerConfiguration.class); + + config.setIterations(2); + config.setBalancingInterval(10000); + config.setMaxSizeToMovePerIteration(50 * OzoneConsts.GB); + + ContainerBalancerTask task = mockedScm.startBalancerTaskAsync(config, false); + // Delay in finishing the first iteration + Thread.sleep(1000L); + List<ContainerBalancerTaskIterationStatusInfo> firstRequestIterationStatistics = + task.getCurrentIterationsStatistic(); + // Delay occurred for some time during the period between iterations. + Thread.sleep(1000L); + List<ContainerBalancerTaskIterationStatusInfo> secondRequestIterationStatistics = + task.getCurrentIterationsStatistic(); + assertEquals(2, firstRequestIterationStatistics.size()); + assertEquals(2, secondRequestIterationStatistics.size()); + assertEquals(firstRequestIterationStatistics.get(0), secondRequestIterationStatistics.get(0)); + + ContainerBalancerTaskIterationStatusInfo currentIterationFromFirstRequest = + firstRequestIterationStatistics.get(1); + ContainerBalancerTaskIterationStatusInfo currentIterationFromSecondRequest = + secondRequestIterationStatistics.get(1); + assertEquals( + currentIterationFromFirstRequest.getIterationNumber(), + currentIterationFromSecondRequest.getIterationNumber()); + assertNotEquals( + currentIterationFromFirstRequest.getIterationDuration(), + currentIterationFromSecondRequest.getIterationDuration()); + assertEquals( + currentIterationFromFirstRequest.getIterationResult(), + currentIterationFromSecondRequest.getIterationResult()); + assertEquals( + currentIterationFromFirstRequest.getContainerMovesScheduled(), + currentIterationFromSecondRequest.getContainerMovesScheduled()); + assertEquals( + currentIterationFromFirstRequest.getContainerMovesCompleted(), + currentIterationFromSecondRequest.getContainerMovesCompleted()); + assertEquals( + currentIterationFromFirstRequest.getContainerMovesFailed(), + currentIterationFromSecondRequest.getContainerMovesFailed()); + assertEquals( + currentIterationFromFirstRequest.getContainerMovesTimeout(), + currentIterationFromSecondRequest.getContainerMovesTimeout()); + assertEquals( + currentIterationFromFirstRequest.getSizeScheduledForMove(), + currentIterationFromSecondRequest.getSizeScheduledForMove()); + assertEquals(currentIterationFromFirstRequest.getDataSizeMoved(), + currentIterationFromSecondRequest.getDataSizeMoved()); + assertEquals(currentIterationFromFirstRequest.getSizeEnteringNodes().size(), + currentIterationFromSecondRequest.getSizeEnteringNodes().size()); + assertEquals( + currentIterationFromFirstRequest.getSizeLeavingNodes().size(), + currentIterationFromSecondRequest.getSizeLeavingNodes().size()); + } + + @Test + void testGetCurrentStatisticsWithDelay() throws Exception { + MockedSCM mockedScm = new MockedSCM(new TestableCluster(20, OzoneConsts.GB)); + + ContainerBalancerConfiguration config = new OzoneConfiguration().getObject(ContainerBalancerConfiguration.class); + + config.setIterations(2); + config.setBalancingInterval(0); + config.setMaxSizeToMovePerIteration(50 * OzoneConsts.GB); + + ContainerBalancerTask task = mockedScm.startBalancerTaskAsync(config, true); + // Delay in finishing the first iteration + LambdaTestUtils.await(1000, 500, () -> task.getCurrentIterationsStatistic().size() == 1); + List<ContainerBalancerTaskIterationStatusInfo> iterationsStatic = task.getCurrentIterationsStatistic(); + assertEquals(1, iterationsStatic.size()); + ContainerBalancerTaskIterationStatusInfo currentIteration = iterationsStatic.get(0); + assertEmptyIteration(currentIteration); + } + + @Test + void testGetCurrentStatisticsWhileBalancingInProgress() throws Exception { + MockedSCM mockedScm = new MockedSCM(new TestableCluster(20, OzoneConsts.GB)); + + ContainerBalancerConfiguration config = new OzoneConfiguration().getObject(ContainerBalancerConfiguration.class); + + config.setIterations(3); + config.setBalancingInterval(0); + config.setMaxSizeToMovePerIteration(50 * OzoneConsts.GB); + + ContainerBalancerTask task = mockedScm.startBalancerTaskAsync(config, false); + // Get the current iteration statistics when it has information about the containers moving. + LambdaTestUtils.await(1000, 10, + () -> task.getCurrentIterationsStatistic().size() == 2 && + task.getCurrentIterationsStatistic().get(1).getContainerMovesScheduled() > 0); + List<ContainerBalancerTaskIterationStatusInfo> iterationsStatic = task.getCurrentIterationsStatistic(); + assertEquals(2, iterationsStatic.size()); + ContainerBalancerTaskIterationStatusInfo currentIteration = iterationsStatic.get(1); + assertCurrentIterationStatisticWhileBalancingInProgress(currentIteration); + } + + private static void assertEmptyIteration(ContainerBalancerTaskIterationStatusInfo iterationsStatic) { Review Comment: what is the difference between assertEmptyIteration() and verifyEmptyIteration() ? ########## hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerMetrics.java: ########## @@ -40,6 +40,9 @@ public final class ContainerBalancerMetrics { " in the latest iteration.") private MutableCounterLong dataSizeMovedGBInLatestIteration; Review Comment: Do we need this metric now? Or is it for backward compatibility? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
