Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Two phase group processing follow up #4775

Merged
merged 3 commits into from
May 25, 2022
Merged

Two phase group processing follow up #4775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2347811
k/group_manager: capture group in first stage finally
mmaslankaprv May 17, 2022
2291d3f
configuration: changed default group initial rebalance delay
mmaslankaprv May 17, 2022
ef051a5
tests: adjusted initial group rebalance delay in tests
mmaslankaprv May 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/v/config/configuration.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ configuration::configuration()
"group_initial_rebalance_delay",
"Extra delay (ms) added to rebalance phase to wait for new members",
{.needs_restart = needs_restart::no, .visibility = visibility::tunable},
300ms)
3s)
, group_new_member_join_timeout(
*this,
"group_new_member_join_timeout",
Expand Down
5 changes: 3 additions & 2 deletions src/v/kafka/server/group_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ group::join_group_stages group_manager::join_group(join_group_request&& r) {

auto ret = group->handle_join_group(std::move(r), is_new_group);
return group::join_group_stages(
std::move(ret.dispatched), ret.result.finally([group] {}));
ret.dispatched.finally([group] {}), ret.result.finally([group] {}));
}

group::sync_group_stages group_manager::sync_group(sync_group_request&& r) {
Expand Down Expand Up @@ -586,7 +586,8 @@ group::sync_group_stages group_manager::sync_group(sync_group_request&& r) {
if (group) {
auto stages = group->handle_sync_group(std::move(r));
return group::sync_group_stages(
std::move(stages.dispatched), stages.result.finally([group] {}));
stages.dispatched.finally([group] {}),
stages.result.finally([group] {}));
} else {
vlog(
klog.trace,
Expand Down
1 change: 1 addition & 0 deletions tests/rptest/tests/compacted_topic_verifier_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ def __init__(self, test_context):
extra_rp_conf = dict(
log_compaction_interval_ms=2000,
compacted_log_segment_size=1048576,
group_initial_rebalance_delay=300,
)

super(CompactedTopicVerifierTest,
Expand Down
1 change: 1 addition & 0 deletions tests/rptest/tests/shadow_indexing_tx_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ def __init__(self, test_context):
enable_transactions=True,
enable_leader_balancer=False,
enable_auto_rebalance_on_node_add=False,
group_initial_rebalance_delay=300,
)

si_settings = SISettings(cloud_storage_reconciliation_interval_ms=500,
Expand Down