Skip to content

[VL] Improve executor shutdown logic #12191

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

Draft
zhouyuan wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −0
Draft

[VL] Improve executor shutdown logic #12191

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
15 changes: 15 additions & 0 deletions cpp/velox/compute/VeloxRuntime.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,21 @@ class HookedExecutor final : public folly::Executor {
state_(std::make_shared<State>()) {}

~HookedExecutor() override {
shuttingDown_.store(true, std::memory_order_release);
if (!join()) {
LOG(WARNING) << "Timed out waiting for hooked executor " << name_ << " to finish after " << joinTimeout_.count()
<< " ms.";
if (debug_) {
dumpOutstandingTasks();
}
}
// We do NOT assume ownership of parent lifecycle,
// so we do NOT call join() blindly.
//
// Instead, we only try a "soft fence" by pushing a no-op barrier.
if (parent_) {
parent_->add([] {});
}
}

uint8_t getNumPriorities() const override {
Expand Down Expand Up @@ -144,12 +152,18 @@ class HookedExecutor final : public folly::Executor {
public:
void add(folly::Func func) override {
GLUTEN_CHECK(parent_ != nullptr, "Parent executor is null.");
if (UNLIKELY(shuttingDown_.load(std::memory_order_acquire))) {
return;
}
state_->inFlight.fetch_add(1, std::memory_order_relaxed);
parent_->add(wrap(std::move(func), 0));
}

void addWithPriority(folly::Func func, int8_t priority) override {
GLUTEN_CHECK(parent_ != nullptr, "Parent executor is null.");
if (UNLIKELY(shuttingDown_.load(std::memory_order_acquire))) {
return;
}
state_->inFlight.fetch_add(1, std::memory_order_relaxed);
parent_->addWithPriority(wrap(std::move(func), priority), priority);
}
Expand Down Expand Up @@ -194,6 +208,7 @@ class HookedExecutor final : public folly::Executor {
bool debug_;
std::chrono::milliseconds joinTimeout_;
std::shared_ptr<State> state_;
std::atomic<bool> shuttingDown_{false};
};

std::unique_ptr<folly::Executor> makeHookedExecutor(
Expand Down
Loading