HDDS-10699. Refactor ContainerBalancerTask and tests in TestContainerBalancerTask #6537
Conversation
This file contains 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 comment was marked as outdated.
This comment was marked as outdated.
Montura
force-pushed
the
container_balancer_tests_refactoring
branch
from
398d112
to
14e70dd
Compare
…e MockedSCM instance for them
Montura
force-pushed
the
container_balancer_tests_refactoring
branch
from
14e70dd
to
8ededd4
Compare
Tejaskriya
reviewed
May 7, 2024
...p-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/MockedSCM.java
Show resolved
Hide resolved
| @@ -79,6 +96,7 @@ public void containerBalancerShouldObeyMaxDatanodesToInvolveLimit(@Nonnull Mocke | |||
| } | |||
| config.setIterations(1); | |||
| config.setMaxSizeToMovePerIteration(50 * STORAGE_UNIT); | |||
| mockedSCM.init(config); | |||
There was a problem hiding this comment.
Relating to the above comment, we would not require to call init here specifically. Similarly for all the test cases in this class.
What is the reason to remove init call within startBalancerTask?
There was a problem hiding this comment.
@Tejaskriya, in some tests we do additional mock-operations for MockedSCM like here.
We have to initialize MockedSCM to do initial mocks and then add some more test-specific mocks.
I'll think how to make it better
Montura
force-pushed
the
container_balancer_tests_refactoring
branch
from
a7d5691
to
d133d78
Compare
Montura
force-pushed
the
container_balancer_tests_refactoring
branch
from
d133d78
to
8b2f423
Compare
sumitagrawl
approved these changes
May 15, 2024
|
@adoroszlai, merge the changes please |
|
Thanks @Montura for the patch, @sumitagrawl, @Tejaskriya for the review. |
jojochuang
pushed a commit
to jojochuang/ozone
that referenced
this pull request
May 23, 2024
errose28
added a commit
to errose28/ozone
that referenced
this pull request
May 28, 2024
…concile-cli * HDDS-10239-container-reconciliation: (296 commits) HDDS-10897. Refactor OzoneQuota (apache#6714) HDDS-10422. Fix some warnings about exposing internal representation in hdds-common (apache#6351) HDDS-10899. Refactor Lease callbacks (apache#6715) HDDS-10890. Increase default value for hdds.container.ratis.log.appender.queue.num-elements (apache#6711) HDDS-10832. Client should switch to streaming based on OpenKeySession replication (apache#6683) HDDS-10435. Support S3 object tags for existing requests (apache#6607) HDDS-10883. Improve logging in Recon for finalising DN logic. (apache#6704) HDDS-8752. Enable TestOzoneRpcClientAbstract#testOverWriteKeyWithAndWithOutVersioning (apache#6702) HDDS-10875. XceiverRatisServer#getRaftPeersInPipeline should be called before XceiverRatisServer#removeGroup (apache#6696) HDDS-10514. Recon - Provide DN decommissioning detailed status and info inline with current CLI command output. (apache#6376) HDDS-10878. Bump zstd-jni to 1.5.6-3 (apache#6701) HDDS-10877. Bump Dropwizard metrics to 3.2.6 (apache#6699) HDDS-10876. Bump jackson to 2.16.2 (apache#6697) HDDS-6116. Remove flaky tag from TestSCMInstallSnapshot (apache#6695) HDDS-2643. TestOzoneDelegationTokenSecretManager#testRenewTokenFailureRenewalTime fails intermittently. HDDS-10699. Refactor ContainerBalancerTask and TestContainerBalancerTask (apache#6537) HDDS-10861. Ozone cli supports default ozone.om.service.id (apache#6680) HDDS-10859. Improve error messages when decommission and maintenance fail-early (apache#6678) HDDS-9031. Upgrade acceptance tests to Docker Compose v2 (apache#6667) HDDS-10559. Add a warning or a check to run repair tool as System user (apache#6574) ... Conflicts: hadoop-ozone/dist/src/main/smoketest/admincli/container.robot
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In PR for HDDS-9889 we discussed with Siddhant Sangwan that tests form
org.apache.hadoop.hdds.scm.container.balancer.TestContainerBalancerTaskcould be refactored usingMockedSCMclass (introduced in HDDS-9889)What changes were proposed in this pull request?
org.apache.hadoop.hdds.scm.container.balancer.TestContainerBalancerTaskorg.apache.hadoop.hdds.scm.container.balancer.ContainerBalancerTaskrelated to changes in refactored testWhat is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-10699
How was this patch tested?
Use standalone tests