Skip to content

Commit

Permalink
Merge pull request #4684 from mmaslankaprv/static-membership
Browse files Browse the repository at this point in the history
Added handling members with `group.instance.id` set i.e. static members
  • Loading branch information
mmaslankaprv committed May 20, 2022
2 parents 4e86751 + a91767e commit f7208fe
Show file tree
Hide file tree
Showing 24 changed files with 926 additions and 165 deletions.
6 changes: 3 additions & 3 deletions src/v/kafka/client/test/fixture.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ namespace kc = kafka::client;
class kafka_client_fixture : public redpanda_thread_fixture {
public:
void restart() {
app.shutdown();
shutdown();
app_signal = std::make_unique<::stop_signal>();
ss::smp::invoke_on_all([this] {
auto& config = config::shard_local_cfg();
config.get("disable_metrics").set_value(false);
Expand All @@ -29,8 +30,7 @@ class kafka_client_fixture : public redpanda_thread_fixture {
app.check_environment();
app.configure_admin_server();
app.wire_up_services();
::stop_signal app_signal;
app.start(app_signal);
app.start(*app_signal);
}

kc::client make_client() { return kc::client{proxy_client_config()}; }
Expand Down
2 changes: 2 additions & 0 deletions src/v/kafka/protocol/leave_group.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ struct leave_group_request final {

// set during request processing after mapping group to ntp
model::ntp ntp;
// additional context, set in decode
api_version version;

void encode(response_writer& writer, api_version version) {
data.encode(writer, version);
Expand Down
1 change: 1 addition & 0 deletions src/v/kafka/protocol/schemata/generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
},
},
"MemberId": ("kafka::member_id", "string"),
"GroupInstanceId": ("kafka::group_instance_id", "string"),
},
"AddPartitionsToTxnRequestData": {
"Topics": {
Expand Down
Loading

0 comments on commit f7208fe

Please sign in to comment.