aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrigoriypisar <grigoriypisar@yandex-team.com>2023-09-07 18:52:35 +0300
committergrigoriypisar <grigoriypisar@yandex-team.com>2023-09-07 19:21:25 +0300
commit3b17f169704dbb1f7a3e582fe1d6ecb1954b8c4f (patch)
treea52056f88cfa6760fd31ae4312d1c4c47b2b4665
parent98a79578994a9ca012f3cb8d6dcdd00a69a8ef25 (diff)
downloadydb-3b17f169704dbb1f7a3e582fe1d6ecb1954b8c4f.tar.gz
fixed unclosed result channel proxies
Зачистки ResultChannelProxies не хватало в kqp_data_executer.cpp, ссылка: https://a.yandex-team.ru/arcadia/ydb/core/kqp/executer_actor/kqp_data_executer.cpp?rev=rXXXXXX#L2312-2327
-rw-r--r--ydb/core/kqp/executer_actor/kqp_executer_impl.h9
-rw-r--r--ydb/core/kqp/executer_actor/kqp_scan_executer.cpp9
2 files changed, 9 insertions, 9 deletions
diff --git a/ydb/core/kqp/executer_actor/kqp_executer_impl.h b/ydb/core/kqp/executer_actor/kqp_executer_impl.h
index 734315dd1f..0df3adb488 100644
--- a/ydb/core/kqp/executer_actor/kqp_executer_impl.h
+++ b/ydb/core/kqp/executer_actor/kqp_executer_impl.h
@@ -1173,6 +1173,15 @@ protected:
protected:
void PassAway() override {
+ for (auto channelPair: ResultChannelProxies) {
+ LOG_D("terminate result channel " << channelPair.first << " proxy at " << channelPair.second->SelfId());
+
+ TAutoPtr<IEventHandle> ev = new IEventHandle(
+ channelPair.second->SelfId(), SelfId(), new TEvents::TEvPoison
+ );
+ channelPair.second->Receive(ev);
+ }
+
LOG_D("terminate execution.");
if (KqpShardsResolverId) {
this->Send(KqpShardsResolverId, new TEvents::TEvPoison);
diff --git a/ydb/core/kqp/executer_actor/kqp_scan_executer.cpp b/ydb/core/kqp/executer_actor/kqp_scan_executer.cpp
index 8179d8162c..95b8bd8d70 100644
--- a/ydb/core/kqp/executer_actor/kqp_scan_executer.cpp
+++ b/ydb/core/kqp/executer_actor/kqp_scan_executer.cpp
@@ -687,15 +687,6 @@ private:
}
void PassAway() override {
- for (auto channelPair: GetResultChannelProxies()) {
- LOG_D("terminate result channel " << channelPair.first << " proxy at " << channelPair.second->SelfId());
-
- TAutoPtr<IEventHandle> ev = new IEventHandle(
- channelPair.second->SelfId(), SelfId(), new TEvents::TEvPoison
- );
- channelPair.second->Receive(ev);
- }
-
auto totalTime = TInstant::Now() - StartTime;
Counters->Counters->ScanTxTotalTimeHistogram->Collect(totalTime.MilliSeconds());