HDDS-8170. Let ContainerBalancer consider EC containers for balancing #4542
Conversation
| boolean legacyEnabled = ozoneConfiguration. | ||
| getBoolean("hdds.scm.replication.enable.legacy", true); |
There was a problem hiding this comment.
The same config can be looked up by replicationManager.getConfig().isLegacyEnabled(). That way we could avoid the need to pass OzoneConfiguration to the constructor, as well as the duplication of config key name.
Nit: I think we can also skip storing this in a local variable.
There was a problem hiding this comment.
Okay, I'm using replicationManager.getConfig().isLegacyEnabled() in this class and ContainerBalancerTask as well now. Changed the unit tests accordingly.
| @@ -49,20 +50,23 @@ public class ContainerBalancerSelectionCriteria { | |||
| private Set<ContainerID> selectedContainers; | |||
| private Set<ContainerID> excludeContainers; | |||
| private FindSourceStrategy findSourceStrategy; | |||
| private OzoneConfiguration ozoneConfiguration; | |||
There was a problem hiding this comment.
nit: this member and the corresponding constructor parameter are no longer needed.
There was a problem hiding this comment.
Oh, thought I removed those already. Anyway I've removed them now.
|
cc @aswinshakil @swamirishi can you'll please take a look? |
What changes were proposed in this pull request?
This PR enables balancing EC containers in
ContainerBalancer. SinceMoveManagerhas been integrated with ContainerBalancer now, we can support balancing EC containers.Changes include:
ContainerBalancerSelectionCriteriaonly if Legacy RM is enabled.DEBUGlogs inMoveManager.ContainerBalancerwhere it was logging aDurationinstead of the long value of a config.TestContainerBalancerTaskto also create EC containers along with the RATIS containers it was already creating. Change some tests accordingly.TestContainerBalancerTask, except in specific tests where we're testing both Legacy RM andMoveManager.What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-8170
How was this patch tested?
Green CI in my fork: https://github.com/siddhantsangwan/ozone/actions/runs/4617711869
Added a UT and did some docker-compose manual testing.
Screenshot showing an EC container with id 6 and replica index 4 being replicated by balancer:
Screenshot showing the same container being deleted:
