Skip to content

Commit

Permalink
KafkaSinkCluster: route ElectLeaders request (#1805)
Browse files Browse the repository at this point in the history
  • Loading branch information
rukai authored Nov 12, 2024
1 parent b48a1f2 commit f8a1570
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 0 deletions.
22 changes: 22 additions & 0 deletions shotover-proxy/tests/kafka_int_tests/test_cases.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,28 @@ async fn admin_setup(connection_builder: &KafkaConnectionBuilder) {
async fn admin_cleanup(connection_builder: &KafkaConnectionBuilder) {
let admin = connection_builder.connect_admin().await;

// Only supported by java driver
#[allow(irrefutable_let_patterns)]
if let KafkaConnectionBuilder::Java(_) = connection_builder {
// It is not clear how to actually invoke this API in a succesful way.
// At the very least this test case shows that shotover succesfully sends and receives this message type (even if the broker responds with an error)
match admin
.elect_leaders(&[TopicPartition {
topic_name: "partitions1_with_offset".to_owned(),
partition: 0,
}])
.await
{
Ok(()) => panic!("elect_leaders is expected to fail since an election is not required"),
Err(e) => {
assert_eq!(
format!("{e}"),
"org.apache.kafka.common.errors.ElectionNotNeededException: Leader election not needed for topic partition.\n"
);
}
}
}

admin.delete_groups(&["some_group", "some_group1"]).await;
delete_records_partitions1(&admin, connection_builder).await;
delete_records_partitions3(&admin, connection_builder).await;
Expand Down
4 changes: 4 additions & 0 deletions shotover/src/transforms/kafka/sink_cluster/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1048,6 +1048,10 @@ The connection to the client has been closed."
body: RequestBody::CreateTopics(_),
..
})) => self.route_to_controller(request),
Some(Frame::Kafka(KafkaFrame::Request {
body: RequestBody::ElectLeaders(_),
..
})) => self.route_to_controller(request),

// route to all nodes
Some(Frame::Kafka(KafkaFrame::Request {
Expand Down
20 changes: 20 additions & 0 deletions test-helpers/src/connection/kafka/java.rs
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,26 @@ impl KafkaAdminJava {
.await;
}

pub async fn elect_leaders(&self, topic_partitions: &[TopicPartition]) -> Result<()> {
let election_type = self
.jvm
.class("org.apache.kafka.common.ElectionType")
.field("PREFERRED");
let topic_partitions_java = self.jvm.new_set(
"org.apache.kafka.common.TopicPartition",
topic_partitions
.iter()
.map(|topic_partition| topic_partition_to_java(&self.jvm, topic_partition))
.collect(),
);

self.admin
.call("electLeaders", vec![election_type, topic_partitions_java])
.call_async_fallible("all", vec![])
.await
.map(|_| ())
}

pub async fn create_acls(&self, acls: Vec<Acl>) {
let resource_type = self
.jvm
Expand Down
10 changes: 10 additions & 0 deletions test-helpers/src/connection/kafka/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,16 @@ impl KafkaAdmin {
}
}

pub async fn elect_leaders(&self, topic_partitions: &[TopicPartition]) -> Result<()> {
match self {
#[cfg(feature = "kafka-cpp-driver-tests")]
Self::Cpp(_) => {
panic!("rdkafka-rs driver does not support elect_leaders")
}
Self::Java(java) => java.elect_leaders(topic_partitions).await,
}
}

pub async fn create_partitions(&self, partitions: &[NewPartition<'_>]) {
match self {
#[cfg(feature = "kafka-cpp-driver-tests")]
Expand Down

0 comments on commit f8a1570

Please sign in to comment.