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

Fix a bug that MPP tasks may leak threads forever (#4241) #4645

Merged
merged 7 commits into from
Apr 14, 2022
+5 −6
Merged

Fix a bug that MPP tasks may leak threads forever (#4241) #4645

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
717e7a3
This is an automated cherry-pick of #4241
bestwoody Mar 15, 2022
7a0e5bb
Update MPPTunnel.cpp
bestwoody Apr 13, 2022
4f48dbd
Merge branch 'release-5.2' into cherry-pick-4241-to-release-5.2
bestwoody Apr 14, 2022
810cb4d
Merge branch 'release-5.2' into cherry-pick-4241-to-release-5.2
zanmato1984 Apr 14, 2022
ba88bea
Merge branch 'release-5.2' into cherry-pick-4241-to-release-5.2
bestwoody Apr 14, 2022
1ddbbc4
format
bestwoody Apr 14, 2022
38b135b
Merge branch 'release-5.2' into cherry-pick-4241-to-release-5.2
bestwoody Apr 14, 2022
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
11 changes: 5 additions & 6 deletions dbms/src/Flash/Mpp/MPPTunnel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// TODO: remove this include after move MPPTask to a single file
#include <Flash/Mpp/MPPHandler.h>
#include <Flash/Mpp/MPPTunnel.h>
#include <Flash/Mpp/Utils.h>
#include <Flash/Mpp/TaskStatus.h>
#include <Flash/Mpp/Utils.h>
#include <fmt/core.h>

namespace DB
Expand All @@ -15,8 +15,7 @@ namespace FailPoints
extern const char exception_during_mpp_close_tunnel[];
} // namespace FailPoints

MPPTunnel::MPPTunnel(
const mpp::TaskMeta & receiver_meta_,
MPPTunnel::MPPTunnel(const mpp::TaskMeta & receiver_meta_,
const mpp::TaskMeta & sender_meta_,
const std::chrono::seconds timeout_,
const std::shared_ptr<MPPTask> & current_task_)
Expand All @@ -26,8 +25,7 @@ MPPTunnel::MPPTunnel(
current_task(current_task_),
tunnel_id(fmt::format("tunnel{}+{}", sender_meta_.task_id(), receiver_meta_.task_id())),
log(&Logger::get(tunnel_id))
{
}
{}

MPPTunnel::~MPPTunnel()
{
Expand Down Expand Up @@ -112,6 +110,8 @@ void MPPTunnel::connect(::grpc::ServerWriter<::mpp::MPPDataPacket> * writer_)
{
throw Exception("has connected");
}
if (finished)
throw Exception("has finished");
LOG_DEBUG(log, "ready to connect");
connected = true;
writer = writer_;
Expand Down Expand Up @@ -149,4 +149,3 @@ void MPPTunnel::finishWithLock()
}

} // namespace DB