This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new d16397915fb [Pick 2.0] "Fix data loss when node channel been cancelled
before close wait (#36662)" (#36740)
d16397915fb is described below
commit d16397915fb04bb476395158556434d757176300
Author: plat1ko <[email protected]>
AuthorDate: Tue Jun 25 11:37:06 2024 +0800
[Pick 2.0] "Fix data loss when node channel been cancelled before close
wait (#36662)" (#36740)
## Proposed changes
Pick from https://github.com/apache/doris/pull/36662
---
be/src/vec/sink/vtablet_sink.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/be/src/vec/sink/vtablet_sink.cpp b/be/src/vec/sink/vtablet_sink.cpp
index 12a822f3ba0..8e6cc8b48f7 100644
--- a/be/src/vec/sink/vtablet_sink.cpp
+++ b/be/src/vec/sink/vtablet_sink.cpp
@@ -1532,7 +1532,7 @@ Status VOlapTableSink::close(RuntimeState* state, Status
exec_status) {
&actual_consume_ns, &total_add_batch_exec_time_ns,
&add_batch_exec_time,
&total_wait_exec_time_ns, &wait_exec_time,
&total_add_batch_num](const
std::shared_ptr<VNodeChannel>& ch) {
- if (!status.ok() || ch->is_closed()) {
+ if (!status.ok() || (ch->is_closed() &&
!ch->is_cancelled())) {
return;
}
// in pipeline, all node channels are done or
canceled, will not block.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
