Skip to content

Commit b506022

Browse files
tinaselengetinaselenge
authored
Revert "Allow KafkaRoller talk to controller directly (#10016)" from 0.45.x release (#10944)
Signed-off-by: Gantigmaa Selenge <[email protected]>
1 parent ca44bff commit b506022

File tree

8 files changed

+83
-257
lines changed

8 files changed

+83
-257
lines changed

‎cluster-operator/src/main/java/io/strimzi/operator/cluster/model/KafkaCluster.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,7 @@ public class KafkaCluster extends AbstractModel implements SupportsMetrics, Supp
124124
protected static final String REPLICATION_PORT_NAME = "tcp-replication";
125125
protected static final int KAFKA_AGENT_PORT = 8443;
126126
protected static final String KAFKA_AGENT_PORT_NAME = "tcp-kafkaagent";
127-
/**
128-
* Port number used for control plane
129-
*/
130-
public static final int CONTROLPLANE_PORT = 9090;
127+
protected static final int CONTROLPLANE_PORT = 9090;
131128
protected static final String CONTROLPLANE_PORT_NAME = "tcp-ctrlplane"; // port name is up to 15 characters
132129

133130
/**

‎cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/resource/KafkaRoller.java

+57-72
Large diffs are not rendered by default.

‎cluster-operator/src/test/java/io/strimzi/operator/cluster/ResourceUtils.java

-10
Original file line numberDiff line numberDiff line change
@@ -518,20 +518,10 @@ public Admin createAdminClient(String bootstrapHostnames, PemTrustSet kafkaCaTru
518518
return createAdminClient(bootstrapHostnames, kafkaCaTrustSet, authIdentity, new Properties());
519519
}
520520

521-
@Override
522-
public Admin createControllerAdminClient(String controllerBootstrapHostnames, PemTrustSet kafkaCaTrustSet, PemAuthIdentity authIdentity) {
523-
return createControllerAdminClient(controllerBootstrapHostnames, kafkaCaTrustSet, authIdentity, new Properties());
524-
}
525-
526521
@Override
527522
public Admin createAdminClient(String bootstrapHostnames, PemTrustSet kafkaCaTrustSet, PemAuthIdentity authIdentity, Properties config) {
528523
return mockAdminClient;
529524
}
530-
531-
@Override
532-
public Admin createControllerAdminClient(String controllerBootstrapHostnames, PemTrustSet kafkaCaTrustSet, PemAuthIdentity authIdentity, Properties config) {
533-
return mockAdminClient;
534-
}
535525
};
536526
}
537527

‎cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/resource/KafkaRollerTest.java

+5-72
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import io.fabric8.kubernetes.client.KubernetesClientException;
1010
import io.strimzi.api.kafka.model.kafka.KafkaResources;
1111
import io.strimzi.operator.cluster.KafkaVersionTestUtils;
12-
import io.strimzi.operator.cluster.model.KafkaCluster;
1312
import io.strimzi.operator.cluster.model.NodeRef;
1413
import io.strimzi.operator.cluster.model.RestartReason;
1514
import io.strimzi.operator.cluster.model.RestartReasons;
@@ -160,43 +159,6 @@ private static AdminClientProvider givenControllerFutureFailsWithTimeout() {
160159
return mock;
161160
}
162161

163-
@Test
164-
public void testTalkingToControllersLatestVersion(VertxTestContext testContext) {
165-
PodOperator podOps = mockPodOpsWithVersion(podId -> succeededFuture(), KafkaVersionTestUtils.getLatestVersion().version());
166-
AdminClientProvider mock = mock(AdminClientProvider.class);
167-
when(mock.createControllerAdminClient(anyString(), any(), any())).thenThrow(new RuntimeException("An error while try to create an admin client with bootstrap controllers"));
168-
169-
TestingKafkaRoller kafkaRoller = new TestingKafkaRoller(addKraftPodNames(0, 0, 1), podOps,
170-
noException(), null, noException(), noException(), noException(),
171-
brokerId -> succeededFuture(true),
172-
true, mock, mockKafkaAgentClientProvider(), true, null, -1);
173-
174-
// When admin client cannot be created for a controller node, we expect it to be force restarted.
175-
doSuccessfulRollingRestart(testContext, kafkaRoller,
176-
asList(0),
177-
asList(0));
178-
}
179-
180-
@Test
181-
public void testTalkingToControllersWithOldVersion(VertxTestContext testContext) throws InterruptedException {
182-
PodOperator podOps = mockPodOpsWithVersion(podId -> succeededFuture(), "3.8.0");
183-
184-
AdminClientProvider mock = mock(AdminClientProvider.class);
185-
when(mock.createAdminClient(anyString(), any(), any())).thenThrow(new RuntimeException("An error while try to create an admin client with bootstrap brokers"));
186-
187-
TestingKafkaRoller kafkaRoller = new TestingKafkaRoller(addKraftPodNames(0, 0, 1), podOps,
188-
noException(), null, noException(), noException(), noException(),
189-
brokerId -> succeededFuture(true),
190-
true, mock, mockKafkaAgentClientProvider(), true, null, -1);
191-
192-
// If the controller has older version (< 3.9.0), we should only be creating admin client for brokers
193-
// and when the operator cannot connect to brokers, we expect to fail initialising KafkaQuorumCheck
194-
doFailingRollingRestart(testContext, kafkaRoller,
195-
asList(0),
196-
KafkaRoller.UnforceableProblem.class, "KafkaQuorumCheck cannot be initialised for c-kafka-0/0 because none of the brokers do not seem to responding to connection attempts",
197-
emptyList());
198-
}
199-
200162
private static KafkaAgentClientProvider mockKafkaAgentClientProvider() {
201163
return mock(KafkaAgentClientProvider.class);
202164
}
@@ -835,17 +797,12 @@ public void clearRestarted() {
835797
}
836798

837799
private PodOperator mockPodOps(Function<Integer, Future<Void>> readiness) {
838-
return mockPodOpsWithVersion(readiness, KafkaVersionTestUtils.getLatestVersion().version());
839-
}
840-
841-
private PodOperator mockPodOpsWithVersion(Function<Integer, Future<Void>> readiness, String version) {
842800
PodOperator podOps = mock(PodOperator.class);
843801
when(podOps.get(any(), any())).thenAnswer(
844802
invocation -> new PodBuilder()
845803
.withNewMetadata()
846-
.withNamespace(invocation.getArgument(0))
847-
.withName(invocation.getArgument(1))
848-
.addToAnnotations(KafkaCluster.ANNO_STRIMZI_IO_KAFKA_VERSION, version)
804+
.withNamespace(invocation.getArgument(0))
805+
.withName(invocation.getArgument(1))
849806
.endMetadata()
850807
.build()
851808
);
@@ -944,33 +901,9 @@ KafkaAgentClient initKafkaAgentClient() {
944901
}
945902

946903
@Override
947-
protected Admin brokerAdminClient(Set<NodeRef> nodes) throws ForceableProblem, FatalProblem {
948-
if (delegateAdminClientCall) {
949-
return super.brokerAdminClient(nodes);
950-
}
951-
RuntimeException exception = acOpenException.apply(nodes);
952-
if (exception != null) {
953-
throw new ForceableProblem("An error while try to create the admin client", exception);
954-
}
955-
Admin ac = mock(AdminClient.class, invocation -> {
956-
if ("close".equals(invocation.getMethod().getName())) {
957-
Admin mock = (Admin) invocation.getMock();
958-
unclosedAdminClients.remove(mock);
959-
if (acCloseException != null) {
960-
throw acCloseException;
961-
}
962-
return null;
963-
}
964-
throw new RuntimeException("Not mocked " + invocation.getMethod());
965-
});
966-
unclosedAdminClients.put(ac, new Throwable("Pod " + nodes));
967-
return ac;
968-
}
969-
970-
@Override
971-
protected Admin controllerAdminClient(Set<NodeRef> nodes) throws ForceableProblem, FatalProblem {
904+
protected Admin adminClient(Set<NodeRef> nodes, boolean b) throws ForceableProblem, FatalProblem {
972905
if (delegateAdminClientCall) {
973-
return super.controllerAdminClient(nodes);
906+
return super.adminClient(nodes, b);
974907
}
975908
RuntimeException exception = acOpenException.apply(nodes);
976909
if (exception != null) {
@@ -1012,7 +945,7 @@ Future<Boolean> canRoll(int podId) {
1012945
}
1013946

1014947
@Override
1015-
protected KafkaQuorumCheck quorumCheck(Admin ac, NodeRef nodeRef) {
948+
protected KafkaQuorumCheck quorumCheck(Admin ac, long controllerQuorumFetchTimeoutMs) {
1016949
Admin admin = mock(Admin.class);
1017950
DescribeMetadataQuorumResult qrmResult = mock(DescribeMetadataQuorumResult.class);
1018951
when(admin.describeMetadataQuorum()).thenReturn(qrmResult);

‎cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/resource/events/KubernetesRestartEventsMockTest.java

-10
Original file line numberDiff line numberDiff line change
@@ -616,20 +616,10 @@ public Admin createAdminClient(String bootstrapHostnames, PemTrustSet kafkaCaTru
616616
return adminClientSupplier.get();
617617
}
618618

619-
@Override
620-
public Admin createControllerAdminClient(String controllerBootstrapHostnames, PemTrustSet kafkaCaTrustSet, PemAuthIdentity authIdentity) {
621-
return adminClientSupplier.get();
622-
}
623-
624619
@Override
625620
public Admin createAdminClient(String bootstrapHostnames, PemTrustSet kafkaCaTrustSet, PemAuthIdentity authIdentity, Properties config) {
626621
return adminClientSupplier.get();
627622
}
628-
629-
@Override
630-
public Admin createControllerAdminClient(String controllerBootstrapHostnames, PemTrustSet kafkaCaTrustSet, PemAuthIdentity authIdentity, Properties config) {
631-
return adminClientSupplier.get();
632-
}
633623
};
634624

635625
return new ResourceOperatorSupplier(vertx,

‎operator-common/src/main/java/io/strimzi/operator/common/AdminClientProvider.java

+2-24
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
public interface AdminClientProvider {
1717

1818
/**
19-
* Create a Kafka Admin interface instance for brokers
19+
* Create a Kafka Admin interface instance
2020
*
2121
* @param bootstrapHostnames Kafka hostname to connect to for administration operations
2222
* @param kafkaCaTrustSet Trust set for connecting to Kafka
@@ -26,17 +26,7 @@ public interface AdminClientProvider {
2626
Admin createAdminClient(String bootstrapHostnames, PemTrustSet kafkaCaTrustSet, PemAuthIdentity authIdentity);
2727

2828
/**
29-
* Create a Kafka Admin interface instance for controllers
30-
*
31-
* @param controllerBootstrapHostnames Kafka controller hostname to connect to for administration operations
32-
* @param kafkaCaTrustSet Trust set for connecting to Kafka
33-
* @param authIdentity Identity for TLS client authentication for connecting to Kafka
34-
* @return Instance of Kafka Admin interface
35-
*/
36-
Admin createControllerAdminClient(String controllerBootstrapHostnames, PemTrustSet kafkaCaTrustSet, PemAuthIdentity authIdentity);
37-
38-
/**
39-
* Create a Kafka Admin interface instance for brokers
29+
* Create a Kafka Admin interface instance
4030
*
4131
* @param bootstrapHostnames Kafka hostname to connect to for administration operations
4232
* @param kafkaCaTrustSet Trust set for connecting to Kafka
@@ -46,16 +36,4 @@ public interface AdminClientProvider {
4636
* @return Instance of Kafka Admin interface
4737
*/
4838
Admin createAdminClient(String bootstrapHostnames, PemTrustSet kafkaCaTrustSet, PemAuthIdentity authIdentity, Properties config);
49-
50-
/**
51-
* Create a Kafka Admin interface instance for controllers
52-
*
53-
* @param controllerBootstrapHostnames Kafka hostname to connect to for administration operations
54-
* @param kafkaCaTrustSet Trust set for connecting to Kafka
55-
* @param authIdentity Identity for TLS client authentication for connecting to Kafka
56-
* @param config Additional configuration for the Kafka Admin Client
57-
*
58-
* @return Instance of Kafka Admin interface
59-
*/
60-
Admin createControllerAdminClient(String controllerBootstrapHostnames, PemTrustSet kafkaCaTrustSet, PemAuthIdentity authIdentity, Properties config);
6139
}

‎operator-common/src/main/java/io/strimzi/operator/common/DefaultAdminClientProvider.java

+5-14
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ public Admin createAdminClient(String bootstrapHostnames, PemTrustSet kafkaCaTru
2121
return createAdminClient(bootstrapHostnames, kafkaCaTrustSet, authIdentity, new Properties());
2222
}
2323

24-
@Override
25-
public Admin createControllerAdminClient(String controllerBootstrapHostnames, PemTrustSet kafkaCaTrustSet, PemAuthIdentity authIdentity) {
26-
return createControllerAdminClient(controllerBootstrapHostnames, kafkaCaTrustSet, authIdentity, new Properties());
27-
}
28-
2924
/**
3025
* Create a Kafka Admin interface instance handling the following different scenarios:
3126
*
@@ -49,30 +44,26 @@ public Admin createControllerAdminClient(String controllerBootstrapHostnames, Pe
4944
*/
5045
@Override
5146
public Admin createAdminClient(String bootstrapHostnames, PemTrustSet kafkaCaTrustSet, PemAuthIdentity authIdentity, Properties config) {
52-
config.setProperty(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapHostnames);
53-
return Admin.create(adminClientConfiguration(kafkaCaTrustSet, authIdentity, config));
54-
}
55-
56-
@Override
57-
public Admin createControllerAdminClient(String controllerBootstrapHostnames, PemTrustSet kafkaCaTrustSet, PemAuthIdentity authIdentity, Properties config) {
58-
config.setProperty(AdminClientConfig.BOOTSTRAP_CONTROLLERS_CONFIG, controllerBootstrapHostnames);
59-
return Admin.create(adminClientConfiguration(kafkaCaTrustSet, authIdentity, config));
47+
return Admin.create(adminClientConfiguration(bootstrapHostnames, kafkaCaTrustSet, authIdentity, config));
6048
}
6149

6250
/**
6351
* Utility method for preparing the Admin client configuration
6452
*
53+
* @param bootstrapHostnames Kafka bootstrap address
6554
* @param kafkaCaTrustSet Trust set for connecting to Kafka
6655
* @param authIdentity Identity for TLS client authentication for connecting to Kafka
6756
* @param config Custom Admin client configuration or empty properties instance
6857
*
6958
* @return Admin client configuration
7059
*/
71-
/* test */ Properties adminClientConfiguration(PemTrustSet kafkaCaTrustSet, PemAuthIdentity authIdentity, Properties config) {
60+
/* test */ static Properties adminClientConfiguration(String bootstrapHostnames, PemTrustSet kafkaCaTrustSet, PemAuthIdentity authIdentity, Properties config) {
7261
if (config == null) {
7362
throw new InvalidConfigurationException("The config parameter should not be null");
7463
}
7564

65+
config.setProperty(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapHostnames);
66+
7667
// configuring TLS encryption if requested
7768
if (kafkaCaTrustSet != null) {
7869
config.putIfAbsent(AdminClientConfig.SECURITY_PROTOCOL_CONFIG, "SSL");

0 commit comments

Comments
 (0)