Skip to content

branch-3.1: [refactor](load) refactor wait logic after quorum success #53884 #54070

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

Merged
morrySnow merged 1 commit into from
Jul 30, 2025
Merged

branch-3.1: [refactor](load) refactor wait logic after quorum success #53884 #54070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion be/src/common/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1530,7 +1530,7 @@ DEFINE_mBool(enable_compaction_pause_on_high_memory, "true");

DEFINE_mBool(enable_quorum_success_write, "true");
DEFINE_mDouble(quorum_success_max_wait_multiplier, "0.2");
DEFINE_mInt64(quorum_success_min_wait_seconds, "10");
DEFINE_mInt64(quorum_success_min_wait_seconds, "60");
DEFINE_mInt32(quorum_success_remaining_timeout_seconds, "30");

DEFINE_mBool(enable_calc_delete_bitmap_between_segments_concurrently, "false");
Expand Down
4 changes: 3 additions & 1 deletion be/src/vec/sink/writer/vtablet_writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ Status IndexChannel::close_wait(

// 2. wait for all node channel to complete as much as possible
if (!unfinished_node_channel_ids.empty() && need_wait_after_quorum_success) {
int64_t arrival_quorum_success_time = UnixMillis();
int64_t max_wait_time_ms = _calc_max_wait_time_ms(unfinished_node_channel_ids);
while (true) {
RETURN_IF_ERROR(check_each_node_channel_close(&unfinished_node_channel_ids,
Expand All @@ -351,7 +352,7 @@ Status IndexChannel::close_wait(
if (unfinished_node_channel_ids.empty()) {
break;
}
int64_t elapsed_ms = UnixMillis() - _start_time;
int64_t elapsed_ms = UnixMillis() - arrival_quorum_success_time;
if (elapsed_ms > max_wait_time_ms ||
_parent->_load_channel_timeout_s - elapsed_ms / 1000 <
config::quorum_success_remaining_timeout_seconds) {
Expand Down Expand Up @@ -469,6 +470,7 @@ int64_t IndexChannel::_calc_max_wait_time_ms(

// 3. calculate max wait time
// introduce quorum_success_min_wait_seconds to avoid jitter of small load
max_wait_time_ms -= UnixMillis() - _start_time;
max_wait_time_ms =
std::max(static_cast<int64_t>(static_cast<double>(max_wait_time_ms) *
(1.0 + config::quorum_success_max_wait_multiplier)),
Expand Down
4 changes: 3 additions & 1 deletion be/src/vec/sink/writer/vtablet_writer_v2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,14 +773,15 @@ Status VTabletWriterV2::_close_wait(

// 2. then wait for remaining streams as much as possible
if (!unfinished_streams.empty() && need_wait_after_quorum_success) {
int64_t arrival_quorum_success_time = UnixMillis();
int64_t max_wait_time_ms = _calc_max_wait_time_ms(streams_for_node, unfinished_streams);
while (true) {
RETURN_IF_ERROR(_check_timeout());
RETURN_IF_ERROR(_check_streams_finish(unfinished_streams, status, streams_for_node));
if (unfinished_streams.empty()) {
break;
}
int64_t elapsed_ms = _timeout_watch.elapsed_time() / 1000 / 1000;
int64_t elapsed_ms = UnixMillis() - arrival_quorum_success_time;
if (elapsed_ms > max_wait_time_ms ||
_state->execution_timeout() - elapsed_ms / 1000 <
config::quorum_success_remaining_timeout_seconds) {
Expand Down Expand Up @@ -898,6 +899,7 @@ int64_t VTabletWriterV2::_calc_max_wait_time_ms(

// 3. calculate max wait time
// introduce quorum_success_min_wait_time_ms to avoid jitter of small load
max_wait_time_ms -= UnixMillis() - _timeout_watch.elapsed_time() / 1000 / 1000;
max_wait_time_ms =
std::max(static_cast<int64_t>(static_cast<double>(max_wait_time_ms) *
(1.0 + config::quorum_success_max_wait_multiplier)),
Expand Down
Loading