Skip to content
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

Add RackAwareDistributionGoal to CC goal config by default #10333

Merged
merged 1 commit into from
Jul 15, 2024
Merged

Add RackAwareDistributionGoal to CC goal config by default #10333

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
1 change: 1 addition & 0 deletions ...main/java/io/strimzi/operator/cluster/model/cruisecontrol/CruiseControlConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public class CruiseControlConfiguration extends AbstractConfiguration {
*/
protected static final List<String> CRUISE_CONTROL_GOALS_LIST = List.of(
CruiseControlGoals.RACK_AWARENESS_GOAL.toString(),
CruiseControlGoals.RACK_AWARENESS_DISTRIBUTION_GOAL.toString(),
CruiseControlGoals.MIN_TOPIC_LEADERS_PER_BROKER_GOAL.toString(),
CruiseControlGoals.REPLICA_CAPACITY_GOAL.toString(),
CruiseControlGoals.DISK_CAPACITY_GOAL.toString(),
Expand Down
2 changes: 1 addition & 1 deletion .../test/java/io/strimzi/operator/cluster/operator/assembly/CruiseControlReconcilerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public void reconcileEnabledCruiseControl(boolean topicOperatorEnabled, VertxTes
assertThat(deployCaptor.getValue(), is(notNullValue()));
assertThat(deployCaptor.getValue().getSpec().getTemplate().getMetadata().getAnnotations().get(Ca.ANNO_STRIMZI_IO_CLUSTER_CA_CERT_GENERATION), is("0"));
assertThat(deployCaptor.getValue().getSpec().getTemplate().getMetadata().getAnnotations().get(Ca.ANNO_STRIMZI_IO_CLUSTER_CA_KEY_GENERATION), is("0"));
assertThat(deployCaptor.getAllValues().get(0).getSpec().getTemplate().getMetadata().getAnnotations().get(CruiseControl.ANNO_STRIMZI_SERVER_CONFIGURATION_HASH), is("096591fb"));
assertThat(deployCaptor.getAllValues().get(0).getSpec().getTemplate().getMetadata().getAnnotations().get(CruiseControl.ANNO_STRIMZI_SERVER_CONFIGURATION_HASH), is("4b8f68dd"));
assertThat(deployCaptor.getAllValues().get(0).getSpec().getTemplate().getMetadata().getAnnotations().get(CruiseControl.ANNO_STRIMZI_CAPACITY_CONFIGURATION_HASH), is("1eb49220"));
assertThat(deployCaptor.getValue().getSpec().getTemplate().getMetadata().getAnnotations().get(Annotations.ANNO_STRIMZI_SERVER_CERT_HASH), is("4d715cdd"));
if (topicOperatorEnabled) {
Expand Down
1 change: 1 addition & 0 deletions documentation/modules/cruise-control/con-optimization-goals.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Strimzi supports most of the optimization goals developed in the Cruise Control
The supported goals, in the default descending order of priority, are as follows:

. Rack-awareness
* Rack-awareness distribution
. Minimum number of leader replicas per broker for a set of topics
. Replica capacity
. Capacity goals
Expand Down
5 changes: 5 additions & 0 deletions ...mmon/src/main/java/io/strimzi/operator/common/model/cruisecontrol/CruiseControlGoals.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ public enum CruiseControlGoals {
*/
RACK_AWARENESS_GOAL("com.linkedin.kafka.cruisecontrol.analyzer.goals.RackAwareGoal"),

/**
* Rack aware distribution goal
*/
RACK_AWARENESS_DISTRIBUTION_GOAL("com.linkedin.kafka.cruisecontrol.analyzer.goals.RackAwareDistributionGoal"),

/**
* Minimum topic leaders per broker goal
*/
Expand Down
Loading