Skip to content
Open
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.kafka.streams.tests;

import org.apache.kafka.common.serialization.Serdes;
import org.apache.kafka.common.utils.Utils;
import org.apache.kafka.common.utils.internals.Exit;
import org.apache.kafka.streams.KafkaStreams;
import org.apache.kafka.streams.StreamsBuilder;
import org.apache.kafka.streams.StreamsConfig;
import org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler;
import org.apache.kafka.streams.kstream.Consumed;
import org.apache.kafka.streams.kstream.Produced;

import java.io.IOException;
import java.time.Duration;
import java.util.Locale;
import java.util.Properties;

public class TopologyDescriptionPluginSystemTest {

private static final String APPLICATION_ID = "kafka-streams-system-test-topology-description-plugin";
private static final String SOURCE_TOPIC = "topologyDescriptionPluginSource";
private static final String SINK_TOPIC = "topologyDescriptionPluginSink";

public static void main(final String[] args) throws IOException {
if (args.length != 1) {
System.err.println("TopologyDescriptionPluginSystemTest expects one parameter: propFile");
Exit.exit(1);
}

System.out.println("TopologyDescriptionPluginSystemTest starting");

final String propFileName = args[0];
final Properties streamsProperties = Utils.loadProps(propFileName);
final String bootstrap = streamsProperties.getProperty(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG);

if (bootstrap == null) {
System.err.println("No bootstrap kafka servers specified in " + StreamsConfig.BOOTSTRAP_SERVERS_CONFIG);
Exit.exit(1);
}

streamsProperties.put(StreamsConfig.APPLICATION_ID_CONFIG, APPLICATION_ID);
streamsProperties.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, Serdes.String().getClass());
streamsProperties.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, Serdes.String().getClass());

final StreamsBuilder builder = new StreamsBuilder();
builder.<String, String>stream(SOURCE_TOPIC, Consumed.with(Serdes.String(), Serdes.String()))
.mapValues(value -> value.toLowerCase(Locale.ROOT))
.groupByKey()
.count()
.toStream()
.mapValues(count -> Long.toString(count))
.to(SINK_TOPIC, Produced.with(Serdes.String(), Serdes.String()));

final KafkaStreams streams = new KafkaStreams(builder.build(), streamsProperties);
streams.setUncaughtExceptionHandler(e -> {
System.err.println("FATAL: An unexpected exception " + e);
System.err.flush();
return StreamsUncaughtExceptionHandler.StreamThreadExceptionResponse.SHUTDOWN_CLIENT;
});

System.out.println("Start Kafka Streams");
streams.start();
System.out.println("STREAMS-STARTED");
System.out.flush();

Exit.addShutdownHook("streams-shutdown-hook", () -> {
streams.close(Duration.ofSeconds(30));
System.out.println("TopologyDescriptionPluginSystemTest closed");
System.out.flush();
});
}
}
45 changes: 45 additions & 0 deletions tests/kafkatest/services/streams.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from .kafka.util import get_log4j_config_param, get_log4j_config_for_tools

STATE_DIR = "state.dir"
INMEMORY_TOPOLOGY_DESCRIPTION_PLUGIN_CLASS = "org.apache.kafka.server.streams.InMemoryTopologyDescriptionPlugin"

class StreamsTestBaseService(KafkaPathResolverMixin, JmxMixin, Service):
"""Base class for Streams Test services providing some common settings and functionality"""
Expand Down Expand Up @@ -763,3 +764,47 @@ def prop_file(self):

cfg = KafkaConfig(**properties)
return cfg.render()


class StreamsTopologyDescriptionPluginService(StreamsTestBaseService):
def __init__(self, test_context, kafka, topology_description_push_enabled=True):
super(StreamsTopologyDescriptionPluginService, self).__init__(
test_context,
kafka,
"org.apache.kafka.streams.tests.TopologyDescriptionPluginSystemTest",
"")
self.topology_description_push_enabled = topology_description_push_enabled

@property
def expectedMessage(self):
return "STREAMS-STARTED"

def prop_file(self):
properties = {
streams_property.STATE_DIR: self.state_dir,
streams_property.KAFKA_SERVERS: self.kafka.bootstrap_servers(),
streams_property.GROUP_PROTOCOL: "streams",
streams_property.TOPOLOGY_DESCRIPTION_PUSH_ENABLED: str(self.topology_description_push_enabled).lower(),
"replication.factor": 1,
"session.timeout.ms": "10000"
}
cfg = KafkaConfig(**properties)
return cfg.render()

def start_cmd(self, node):
args = self.args.copy()
args['config_file'] = self.CONFIG_FILE
args['stdout'] = self.STDOUT_FILE
args['stderr'] = self.STDERR_FILE
args['pidfile'] = self.PID_FILE
args['log4j_param'] = get_log4j_config_param(node)
args['log4j'] = get_log4j_config_for_tools(node)
args['kafka_run_class'] = self.path.script("kafka-run-class.sh", node)

cmd = "( export KAFKA_LOG4J_OPTS=\"%(log4j_param)s%(log4j)s\"; " \
"INCLUDE_TEST_JARS=true %(kafka_run_class)s %(streams_class_name)s " \
" %(config_file)s & echo $! >&3 ) 1>> %(stdout)s 2>> %(stderr)s 3> %(pidfile)s" % args

self.logger.info("Executing: " + cmd)

return cmd
1 change: 1 addition & 0 deletions tests/kafkatest/services/streams_property.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@
NUM_THREADS = "num.stream.threads"
PROCESSING_GUARANTEE = "processing.guarantee"
GROUP_PROTOCOL = "group.protocol"
TOPOLOGY_DESCRIPTION_PUSH_ENABLED = "topology.description.push.enabled"
4 changes: 3 additions & 1 deletion tests/kafkatest/tests/streams/base_streams_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from kafkatest.services.verifiable_consumer import VerifiableConsumer
from kafkatest.services.verifiable_producer import VerifiableProducer
from kafkatest.services.kafka import KafkaService
from kafkatest.services.streams import INMEMORY_TOPOLOGY_DESCRIPTION_PLUGIN_CLASS


class BaseStreamsTest(Test):
Expand All @@ -42,7 +43,8 @@ def __init__(self, test_context, topics, num_controllers=1, num_brokers=3):
use_streams_groups=True,
server_prop_overrides=[
[ "group.streams.min.session.timeout.ms", "10000" ], # Need to up the lower bound
[ "group.streams.session.timeout.ms", "10000" ] # As in classic groups, set this to 10s
[ "group.streams.session.timeout.ms", "10000" ], # As in classic groups, set this to 10s
[ "group.streams.topology.description.plugin.class", INMEMORY_TOPOLOGY_DESCRIPTION_PLUGIN_CLASS ]
]
)

Expand Down
16 changes: 13 additions & 3 deletions tests/kafkatest/tests/streams/streams_broker_bounce_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@
from ducktape.mark.resource import cluster
from ducktape.mark import matrix
from kafkatest.services.kafka import KafkaService, quorum
from kafkatest.services.streams import StreamsSmokeTestDriverService, StreamsSmokeTestJobRunnerService
from kafkatest.services.streams import (
INMEMORY_TOPOLOGY_DESCRIPTION_PLUGIN_CLASS,
StreamsSmokeTestDriverService,
StreamsSmokeTestJobRunnerService,
)
import time
import signal
from random import randint
Expand Down Expand Up @@ -164,10 +168,16 @@ def confirm_topics_on_all_brokers(self, expected_topic_set):
def setup_system(self, start_processor=True, num_threads=3, group_protocol='classic'):
# Setup phase
use_streams_groups = True if group_protocol == 'streams' else False
self.kafka = KafkaService(self.test_context, num_nodes=self.replication, zk=None, topics=self.topics, server_prop_overrides=[
server_prop_overrides = [
["offsets.topic.num.partitions", self.partitions],
["offsets.topic.replication.factor", self.replication]
], use_streams_groups=use_streams_groups)
]
if use_streams_groups:
server_prop_overrides.append(
["group.streams.topology.description.plugin.class", INMEMORY_TOPOLOGY_DESCRIPTION_PLUGIN_CLASS])
self.kafka = KafkaService(self.test_context, num_nodes=self.replication, zk=None, topics=self.topics,
server_prop_overrides=server_prop_overrides,
use_streams_groups=use_streams_groups)
self.kafka.start()

# allow some time for topics to be created
Expand Down
15 changes: 10 additions & 5 deletions tests/kafkatest/tests/streams/streams_broker_compatibility_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@
from ducktape.tests.test import Test
from ducktape.utils.util import wait_until
from kafkatest.services.kafka import KafkaService, quorum
from kafkatest.services.streams import StreamsBrokerCompatibilityService
from kafkatest.services.streams import (
INMEMORY_TOPOLOGY_DESCRIPTION_PLUGIN_CLASS,
StreamsBrokerCompatibilityService,
)
from kafkatest.services.verifiable_consumer import VerifiableConsumer
from kafkatest.version import LATEST_3_0, LATEST_3_1, LATEST_3_2, LATEST_3_3, LATEST_3_4, LATEST_3_5, LATEST_3_6, \
LATEST_3_7, LATEST_3_8, LATEST_3_9, LATEST_4_0, LATEST_4_1, LATEST_4_2, LATEST_4_3, KafkaVersion
LATEST_3_7, LATEST_3_8, LATEST_3_9, LATEST_4_0, LATEST_4_1, LATEST_4_2, LATEST_4_3, DEV_BRANCH, KafkaVersion


class StreamsBrokerCompatibility(Test):
Expand All @@ -45,7 +48,8 @@ def __init__(self, test_context):
},
server_prop_overrides=[
["transaction.state.log.replication.factor", "1"],
["transaction.state.log.min.isr", "1"]
["transaction.state.log.min.isr", "1"],
["group.streams.topology.description.plugin.class", INMEMORY_TOPOLOGY_DESCRIPTION_PLUGIN_CLASS]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR description says the plugin is enabled "for DEV_VERSION", but this override applies to every broker version in the matrix. It happens to work because group.streams.topology.description.plugin.class only exists on trunk (not in 4.3 or earlier), so older brokers just log an unknown-config warning and ignore it — but that's subtle enough to deserve an inline comment.

Also, since StreamsBrokerCompatibilityService runs with the classic protocol (no streams groups exist in this test), the plugin is instantiated but never exercised. Could you clarify what this addition is meant to verify — that a DEV broker with the plugin configured doesn't affect classic-protocol streams apps? A short comment stating that intent would help.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix: I added comments about this config: 1) it is only in actual effect when broker_version>4.3 2) This test is only using classic group so the plugin is not taking effect.

])
self.consumer = VerifiableConsumer(test_context,
1,
Expand All @@ -58,9 +62,10 @@ def __init__(self, test_context):
@matrix(broker_version=[str(LATEST_3_0),str(LATEST_3_1),str(LATEST_3_2),str(LATEST_3_3),
str(LATEST_3_4),str(LATEST_3_5),str(LATEST_3_6),str(LATEST_3_7),
str(LATEST_3_8),str(LATEST_3_9),str(LATEST_4_0),str(LATEST_4_1),
str(LATEST_4_2),str(LATEST_4_3)],
str(LATEST_4_2),str(LATEST_4_3),str(DEV_BRANCH)],
metadata_quorum=[quorum.combined_kraft]
)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stray whitespace-only line added between the @matrix decorator and the test method — please remove.

def test_compatible_brokers_eos_disabled(self, broker_version, metadata_quorum):
self.kafka.set_version(KafkaVersion(broker_version))
self.kafka.start()
Expand All @@ -81,7 +86,7 @@ def test_compatible_brokers_eos_disabled(self, broker_version, metadata_quorum):
@matrix(broker_version=[str(LATEST_3_0),str(LATEST_3_1),str(LATEST_3_2),str(LATEST_3_3),
str(LATEST_3_4),str(LATEST_3_5),str(LATEST_3_6),str(LATEST_3_7),
str(LATEST_3_8),str(LATEST_3_9),str(LATEST_4_0),str(LATEST_4_1),
str(LATEST_4_2),str(LATEST_4_3)],
str(LATEST_4_2),str(LATEST_4_3),str(DEV_BRANCH)],
metadata_quorum=[quorum.combined_kraft])
def test_compatible_brokers_eos_v2_enabled(self, broker_version, metadata_quorum):
self.kafka.set_version(KafkaVersion(broker_version))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import time

from ducktape.mark import matrix
from ducktape.mark.resource import cluster
from ducktape.tests.test import Test
from kafkatest.services.kafka import KafkaService, quorum
from kafkatest.services.streams import (
INMEMORY_TOPOLOGY_DESCRIPTION_PLUGIN_CLASS,
StreamsTopologyDescriptionPluginService,
)


class StreamsTopologyDescriptionPluginTest(Test):

PUSH_REQUESTED_LOG = "Broker requested topology description push"
PUSH_SENDING_LOG = "Sending topology description for group"
PUSH_SUCCESS_LOG = "Topology description pushed successfully"

SOURCE_TOPIC = "topologyDescriptionPluginSource"
SINK_TOPIC = "topologyDescriptionPluginSink"

def __init__(self, test_context):
super(StreamsTopologyDescriptionPluginTest, self).__init__(test_context=test_context)
self.topics = {
self.SOURCE_TOPIC: {"partitions": 1, "replication-factor": 1},
self.SINK_TOPIC: {"partitions": 1, "replication-factor": 1},
}

def setup_kafka(self, plugin_enabled):
server_prop_overrides = [
["group.streams.min.session.timeout.ms", "10000"],
["group.streams.session.timeout.ms", "10000"],
]
if plugin_enabled:
server_prop_overrides.append(
["group.streams.topology.description.plugin.class", INMEMORY_TOPOLOGY_DESCRIPTION_PLUGIN_CLASS])
self.kafka = KafkaService(
self.test_context,
num_nodes=1,
zk=None,
topics=self.topics,
use_streams_groups=True,
server_prop_overrides=server_prop_overrides,
)
self.kafka.start()
self.kafka.run_features_command("upgrade", "streams.version", 1)

@cluster(num_nodes=2)
@matrix(metadata_quorum=[quorum.combined_kraft])
def test_topology_description_available_with_plugin(self, metadata_quorum):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are follow-up scenarios planned for the plugin lifecycle? Three come to mind that the in-memory plugin makes observable with exactly the infrastructure this PR adds:

  1. Broker bounce → re-solicitation: the InMemoryTopologyDescriptionPlugin loses its state on restart, so after a bounce the broker should solicit again and the client should push a second time (happy-path push → bounce → wait for a second Topology description pushed successfully).
  2. Client restart with the description already stored: restart only the streams app while the broker keeps running — since storedDescriptionTopologyEpoch == currentTopologyEpoch, the broker should not solicit again.
  3. Multiple members, single push: with 2+ clients in the group, the solicitation back-off (StreamsGroupTopologyDescriptionManager.armIfNotActive) should prevent every member from pushing the same description — e.g. assert the second member never sends while the first push succeeds.

No need to grow this PR — just wondering whether these are on the part-2 list.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the ideas! I will append more scenarios in a followup PR.

"""
Test the situation when the broker has the topology description plugin configured
and the client pushes by default. The broker should solicit a push and the client
should complete it successfully.
"""
self.setup_kafka(plugin_enabled=True)
processor = StreamsTopologyDescriptionPluginService(self.test_context, self.kafka)
with processor.node.account.monitor_log(processor.LOG_FILE) as monitor:
processor.start()
monitor.wait_until(self.PUSH_SUCCESS_LOG,
timeout_sec=120,
err_msg="Streams client did not log a successful topology description push")
processor.stop()

@cluster(num_nodes=2)
@matrix(metadata_quorum=[quorum.combined_kraft])
def test_topology_description_not_stored_when_client_opts_out(self, metadata_quorum):
"""
Test the situation when the broker has the topology description plugin configured
but the client opts out via topology.description.push.enabled=false. The client
should never send a topology description even though the broker solicits one.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit on the docstring: "even though the broker solicits one" is true broker-side, but it isn't observable in this test. When the client opts out, StreamThread never sets the wire topology description, so the Broker requested topology description push log in StreamsGroupHeartbeatRequestManager is suppressed too (the condition requires a non-null wire description). Maybe reword so a future reader doesn't try to assert PUSH_REQUESTED_LOG > 0 here and get confused when it's 0.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix: added additional explanation indicating the "broker requested topology description push" log never appears; an additional assertion on this is also added.

"""
self.setup_kafka(plugin_enabled=True)
processor = StreamsTopologyDescriptionPluginService(
self.test_context, self.kafka, topology_description_push_enabled=False)
processor.start()
time.sleep(30)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The two negative tests can pass vacuously: processor.start() only waits for STREAMS-STARTED, which is printed right after KafkaStreams#start() returns — before the client has joined the streams group. If the app crashes or never manages to join during the 30s sleep, the grep -c == 0 assertions still pass even though nothing was actually verified.

Consider waiting for a positive liveness signal before doing the negative grep — e.g. wait for the State transition from REBALANCING to RUNNING line in the streams log (which implies successful heartbeats with the coordinator), and only then assert the push logs are absent. Same applies to test_topology_description_not_stored_without_plugin below.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix: added assertions to wait for client to join the group.

sent = processor.node.account.ssh_capture(
"grep -c '%s' %s || true" % (self.PUSH_SENDING_LOG, processor.LOG_FILE),
allow_fail=False)
assert int(next(sent).strip()) == 0, \
"Client sent a topology description despite topology.description.push.enabled=false"
pushed = processor.node.account.ssh_capture(
"grep -c '%s' %s || true" % (self.PUSH_SUCCESS_LOG, processor.LOG_FILE),
allow_fail=False)
assert int(next(pushed).strip()) == 0, \
"Client logged a successful push despite topology.description.push.enabled=false"
processor.stop()

@cluster(num_nodes=2)
@matrix(metadata_quorum=[quorum.combined_kraft])
def test_topology_description_not_stored_without_plugin(self, metadata_quorum):
"""
Test the situation when no topology description plugin is configured on the broker.
The broker should never solicit a topology push from the client.
"""
self.setup_kafka(plugin_enabled=False)
processor = StreamsTopologyDescriptionPluginService(self.test_context, self.kafka)
processor.start()
time.sleep(30)
# count how many lines in streams.log contain Broker requested topology description push
solicited = processor.node.account.ssh_capture(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This only checks Broker requested topology description push count == 0. Belt-and-suspenders: also assert PUSH_SENDING_LOG == 0 and PUSH_SUCCESS_LOG == 0. Cheap defense against a client-side regression where the client pushes uninvited.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix: added the 2 client-side assertions

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

StreamsGroupHeartbeatRequestManager.java:657-660:

if (data.topologyDescriptionRequired() && streamsRebalanceData.wireTopologyDescription() != null) {
    logger.info("Broker requested topology description push");

When topology.description.push.enabled=false, wireTopologyDescription() is null, so this log line is never emitted. That means: regardless of whether the broker sets topologyDescriptionRequired=true, the count will always be 0. This assertion cannot distinguish "broker never solicited" from "broker did solicit but the client silently ignored it" — and the latter is exactly the gap I originally asked to be defended against. To actually verify this, the assertion needs to move to the broker side (for example, "the broker logged that setTopology was requested, but setTopology was never invoked").

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I added a broker log after the config is solicit on the broker side, and an additional check in the system test for its appearance.

"grep -c '%s' %s || true" % (self.PUSH_REQUESTED_LOG, processor.LOG_FILE),
allow_fail=False)
assert int(next(solicited).strip()) == 0, \
"Broker solicited a topology push even though no plugin was configured"
processor.stop()
Loading