diff --git a/src/v/config/configuration.cc b/src/v/config/configuration.cc index a6a15736c56c..2dc465b6d443 100644 --- a/src/v/config/configuration.cc +++ b/src/v/config/configuration.cc @@ -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", diff --git a/src/v/kafka/server/group_manager.cc b/src/v/kafka/server/group_manager.cc index e28d8cd3c0ae..821507b622a8 100644 --- a/src/v/kafka/server/group_manager.cc +++ b/src/v/kafka/server/group_manager.cc @@ -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) { @@ -580,7 +580,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, diff --git a/tests/rptest/tests/compacted_topic_verifier_test.py b/tests/rptest/tests/compacted_topic_verifier_test.py index f257dc2cf7bd..9a80f7691cc2 100644 --- a/tests/rptest/tests/compacted_topic_verifier_test.py +++ b/tests/rptest/tests/compacted_topic_verifier_test.py @@ -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, diff --git a/tests/rptest/tests/shadow_indexing_tx_test.py b/tests/rptest/tests/shadow_indexing_tx_test.py index 0e851b1e7830..5c5578eb8e07 100644 --- a/tests/rptest/tests/shadow_indexing_tx_test.py +++ b/tests/rptest/tests/shadow_indexing_tx_test.py @@ -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,