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

fix last comments

Browse Source
This commit is contained in:
antoniofilipovic 2024-03-23 18:24:10 +01:00
parent 68c1d2526e
commit cd6bd9e350
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/coordination/coordinator_instance.cpp
View File

@ -80,15 +80,12 @@ CoordinatorInstance::CoordinatorInstance()
// We need to stop checks before taking a lock because deadlock can happen if instances waits // We need to stop checks before taking a lock because deadlock can happen if instances waits
// to take a lock in frequent check, and this thread already has a lock and waits for instance to // to take a lock in frequent check, and this thread already has a lock and waits for instance to
// be done with frequent check // be done with frequent check
for (auto &repl_instance : repl_instances_) {
repl_instance.StopFrequentCheck();
}
auto lock = std::unique_lock{coord_instance_lock_};
std::ranges::for_each(repl_instances_, [](auto &repl_instance) { std::ranges::for_each(repl_instances_, [](auto &repl_instance) {
spdlog::trace("Stopping frequent checks for instance {}", repl_instance.InstanceName()); spdlog::trace("Stopping frequent checks for instance {}", repl_instance.InstanceName());
repl_instance.StopFrequentCheck(); repl_instance.StopFrequentCheck();
spdlog::trace("Stopped frequent checks for instance {}", repl_instance.InstanceName()); spdlog::trace("Stopped frequent checks for instance {}", repl_instance.InstanceName());
}); });
auto lock = std::unique_lock{coord_instance_lock_};
repl_instances_.clear(); repl_instances_.clear();
spdlog::info("Stopped all replication instance frequent checks."); spdlog::info("Stopped all replication instance frequent checks.");
}); });

2
src/coordination/coordinator_state_machine.cpp
View File

@ -39,7 +39,7 @@ auto CoordinatorStateMachine::CreateLog(nlohmann::json &&log) -> ptr<buffer> {
} }
auto CoordinatorStateMachine::SerializeOpenLock() -> ptr<buffer> { auto CoordinatorStateMachine::SerializeOpenLock() -> ptr<buffer> {
return CreateLog({{"action", RaftLogAction::OPEN_LOCK}, {"info", nullptr}}); return CreateLog({{"action", RaftLogAction::OPEN_LOCK}});
} }
auto CoordinatorStateMachine::SerializeRegisterInstance(CoordinatorToReplicaConfig const &config) -> ptr<buffer> { auto CoordinatorStateMachine::SerializeRegisterInstance(CoordinatorToReplicaConfig const &config) -> ptr<buffer> {

4
src/coordination/include/nuraft/coordinator_cluster_state.hpp
View File

@ -64,8 +64,8 @@ struct CoordinatorInstanceState {
void to_json(nlohmann::json &j, ReplicationInstanceState const &instance_state); void to_json(nlohmann::json &j, ReplicationInstanceState const &instance_state);
void from_json(nlohmann::json const &j, ReplicationInstanceState &instance_state); void from_json(nlohmann::json const &j, ReplicationInstanceState &instance_state);
using TRaftLog = std::variant<std::monostate, CoordinatorToReplicaConfig, std::string, utils::UUID, using TRaftLog = std::variant<std::string, utils::UUID, CoordinatorToReplicaConfig, CoordinatorToCoordinatorConfig,
CoordinatorToCoordinatorConfig, InstanceUUIDUpdate>; InstanceUUIDUpdate, std::monostate>;
using nuraft::buffer; using nuraft::buffer;
using nuraft::buffer_serializer; using nuraft::buffer_serializer;