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

chore: call breaker_cb_ on shutdown #3128

Merged
merged 2 commits into from
Jun 6, 2024
Merged

chore: call breaker_cb_ on shutdown #3128

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4db0e5
chore: call breaker_cb_ on shutdown
romange Jun 5, 2024
8f261d6
chore: make sure we call breaker_cb_ only once
romange Jun 5, 2024
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 .github/workflows/reusable-container-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:

- if: ${{ hashFiles(format('{0}-{1}', matrix.dockerfile, inputs.build_type)) }}
name: Build release image for arm64
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/arm64
Expand Down
22 changes: 2 additions & 20 deletions src/facade/dragonfly_connection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,11 +552,8 @@ Connection::~Connection() {
void Connection::OnShutdown() {
VLOG(1) << "Connection::OnShutdown";

if (shutdown_cb_) {
for (const auto& k_v : shutdown_cb_->map) {
k_v.second();
}
}
if (breaker_cb_)
breaker_cb_(POLLHUP);
}

void Connection::OnPreMigrateThread() {
Expand Down Expand Up @@ -600,21 +597,6 @@ void Connection::OnPostMigrateThread() {
}
}

auto Connection::RegisterShutdownHook(ShutdownCb cb) -> ShutdownHandle {
if (!shutdown_cb_) {
shutdown_cb_ = make_unique<Shutdown>();
}
return shutdown_cb_->Add(std::move(cb));
}

void Connection::UnregisterShutdownHook(ShutdownHandle id) {
if (shutdown_cb_) {
shutdown_cb_->Remove(id);
if (shutdown_cb_->map.empty())
shutdown_cb_.reset();
}
}

void Connection::HandleRequests() {
ThisFiber::SetName("DflyConnection");

Expand Down
6 changes: 0 additions & 6 deletions src/facade/dragonfly_connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,6 @@ class Connection : public util::Connection {
// reached. Blocks until free space is available. Controlled with `pipeline_queue_limit` flag.
void EnsureAsyncMemoryBudget();

// Register hook that is executed on connection shutdown.
ShutdownHandle RegisterShutdownHook(ShutdownCb cb);

void UnregisterShutdownHook(ShutdownHandle id);

// Register hook that is executen when the connection breaks.
void RegisterBreakHook(BreakerCb breaker_cb);

Expand Down Expand Up @@ -428,7 +423,6 @@ class Connection : public util::Connection {
unsigned parser_error_ = 0;

BreakerCb breaker_cb_;
std::unique_ptr<Shutdown> shutdown_cb_;

// Used by redis parser to avoid allocations
RespVec tmp_parse_args_;
Expand Down
Loading