File tree 2 files changed +7
-2
lines changed
systemtest/src/test/java/io/strimzi/systemtest
2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -2194,8 +2194,8 @@ void testLoggingHierarchy() {
2194
2194
}
2195
2195
)
2196
2196
void testChangingInternalToExternalLoggingTriggerRollingUpdate () {
2197
- // This test currently does not work with Kafka 4.0 due to some logging related changes and is therefore disabled when Kafka 4.0 or newer is used .
2198
- // This should be re-enabled once we fix the issue: https://github.com/strimzi/strimzi-kafka-operator/issues/11312
2197
+ // This test only works with Kafka 3.9.0 since Kafka 4.0.0 uses Log4j2 which provides dynamic logging changes for the brokers .
2198
+ // This test can be removed once Kafka 3.9.0 is dropped from support.
2199
2199
Assumptions .assumeTrue (TestKafkaVersion .compareDottedVersions (Environment .ST_KAFKA_VERSION , "4.0.0" ) < 0 );
2200
2200
2201
2201
final TestStorage testStorage = new TestStorage (ResourceManager .getTestContext ());
Original file line number Diff line number Diff line change 11
11
import io .strimzi .api .kafka .model .kafka .Kafka ;
12
12
import io .strimzi .api .kafka .model .kafka .cruisecontrol .CruiseControlResources ;
13
13
import io .strimzi .api .kafka .model .rebalance .KafkaRebalance ;
14
+ import io .strimzi .api .kafka .model .rebalance .KafkaRebalanceAnnotation ;
14
15
import io .strimzi .operator .common .Annotations ;
15
16
import io .strimzi .operator .common .model .Labels ;
16
17
import io .strimzi .systemtest .AbstractST ;
@@ -332,6 +333,10 @@ void testKafkaCCAndRebalanceWithMultipleCOs() {
332
333
333
334
KafkaUtils .waitForClusterStability (testStorage .getNamespaceName (), testStorage .getClusterName ());
334
335
336
+ // Refresh the KafkaRebalance to make sure it's not in `NotReady` state due to CruiseControlRestException
337
+ // This can happen if the new Cruise Control pod was not up and request was propagated to old Cruise Control
338
+ KafkaRebalanceUtils .annotateKafkaRebalanceResource (testStorage .getNamespaceName (), testStorage .getClusterName (), KafkaRebalanceAnnotation .refresh );
339
+
335
340
KafkaRebalanceUtils .doRebalancingProcess (testStorage .getNamespaceName (), testStorage .getClusterName ());
336
341
337
342
LOGGER .info ("Verifying that operands are operated by expected Cluster Operator {}" , FIRST_CO_NAME );
You can’t perform that action at this time.
0 commit comments