Skip to content

Commit 93355d6

Browse files
committed
Fixed the comment and added refresh annotation to the test
Signed-off-by: ShubhamRwt <[email protected]>
1 parent d9939e9 commit 93355d6

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

systemtest/src/test/java/io/strimzi/systemtest/log/LoggingChangeST.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2194,8 +2194,8 @@ void testLoggingHierarchy() {
21942194
}
21952195
)
21962196
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.
21992199
Assumptions.assumeTrue(TestKafkaVersion.compareDottedVersions(Environment.ST_KAFKA_VERSION, "4.0.0") < 0);
22002200

22012201
final TestStorage testStorage = new TestStorage(ResourceManager.getTestContext());

systemtest/src/test/java/io/strimzi/systemtest/operators/MultipleClusterOperatorsST.java

+5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import io.strimzi.api.kafka.model.kafka.Kafka;
1212
import io.strimzi.api.kafka.model.kafka.cruisecontrol.CruiseControlResources;
1313
import io.strimzi.api.kafka.model.rebalance.KafkaRebalance;
14+
import io.strimzi.api.kafka.model.rebalance.KafkaRebalanceAnnotation;
1415
import io.strimzi.operator.common.Annotations;
1516
import io.strimzi.operator.common.model.Labels;
1617
import io.strimzi.systemtest.AbstractST;
@@ -332,6 +333,10 @@ void testKafkaCCAndRebalanceWithMultipleCOs() {
332333

333334
KafkaUtils.waitForClusterStability(testStorage.getNamespaceName(), testStorage.getClusterName());
334335

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+
335340
KafkaRebalanceUtils.doRebalancingProcess(testStorage.getNamespaceName(), testStorage.getClusterName());
336341

337342
LOGGER.info("Verifying that operands are operated by expected Cluster Operator {}", FIRST_CO_NAME);

0 commit comments

Comments
 (0)