tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug where the MachineManager's destructor became incorrect after being moved

Browse Source
This commit is contained in:
Tyler Neely 2022-11-02 17:45:27 +00:00
parent a815ec9617
commit fa1ddfea12
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/coordinator/coordinator_worker.hpp
View File

@ -88,6 +88,7 @@ class Queue {
public: public:
void Push(Message &&message) { void Push(Message &&message) {
{ {
MG_ASSERT(inner_.use_count() > 0);
std::unique_lock<std::mutex> lock(inner_->mu); std::unique_lock<std::mutex> lock(inner_->mu);
inner_->queue.emplace_back(std::forward<Message>(message)); inner_->queue.emplace_back(std::forward<Message>(message));
@ -132,7 +133,7 @@ class CoordinatorWorker {
public: public:
CoordinatorWorker(io::Io<IoImpl> io, Queue queue, Coordinator coordinator) CoordinatorWorker(io::Io<IoImpl> io, Queue queue, Coordinator coordinator)
: io_(io), queue_(queue), coordinator_{std::move(io.ForkLocal()), {}, std::move(coordinator)} {} : io_(io), queue_(std::move(queue)), coordinator_{std::move(io.ForkLocal()), {}, std::move(coordinator)} {}
CoordinatorWorker(CoordinatorWorker &&) = default; CoordinatorWorker(CoordinatorWorker &&) = default;
CoordinatorWorker &operator=(CoordinatorWorker &&) = default; CoordinatorWorker &operator=(CoordinatorWorker &&) = default;

8
src/machine_manager/machine_manager.hpp
View File

@ -92,10 +92,10 @@ class MachineManager {
MachineManager &operator=(const MachineManager &) = delete; MachineManager &operator=(const MachineManager &) = delete;
~MachineManager() { ~MachineManager() {
coordinator_queue_.Push(coordinator::coordinator_worker::ShutDown{}); if (coordinator_handle_.joinable()) {
spdlog::error("a"); coordinator_queue_.Push(coordinator::coordinator_worker::ShutDown{});
std::move(coordinator_handle_).join(); std::move(coordinator_handle_).join();
spdlog::error("b"); }
} }
Address CoordinatorAddress() { return coordinator_address_; } Address CoordinatorAddress() { return coordinator_address_; }

1
src/storage/v3/shard_worker.hpp
View File

@ -92,6 +92,7 @@ class Queue {
public: public:
void Push(Message &&message) { void Push(Message &&message) {
{ {
MG_ASSERT(inner_.use_count() > 0);
std::unique_lock<std::mutex> lock(inner_->mu); std::unique_lock<std::mutex> lock(inner_->mu);
inner_->queue.emplace_back(std::forward<Message>(message)); inner_->queue.emplace_back(std::forward<Message>(message));