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

fix issues

Browse Source
This commit is contained in:
antoniofilipovic 2024-01-25 14:00:29 +01:00
parent 326a04c6a3
commit ec46cca7a3
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/coordination/coordinator_data.cpp
View File

@ -179,6 +179,8 @@ auto CoordinatorData::SetInstanceToMain(std::string instance_name) -> SetInstanc
registered_replica->client_.SetSuccCallback(main_succ_cb_); registered_replica->client_.SetSuccCallback(main_succ_cb_);
registered_replica->client_.SetFailCallback(main_fail_cb_); registered_replica->client_.SetFailCallback(main_fail_cb_);
registered_replica->client_.StartFrequentCheck();
return SetInstanceToMainCoordinatorStatus::SUCCESS; return SetInstanceToMainCoordinatorStatus::SUCCESS;
} }

18
src/query/interpreter.cpp
View File

@ -852,10 +852,10 @@ Callback HandleReplicationQuery(ReplicationQuery *repl_query, const Parameters &
case ReplicationQuery::Action::SET_REPLICATION_ROLE: { case ReplicationQuery::Action::SET_REPLICATION_ROLE: {
#ifdef MG_ENTERPRISE #ifdef MG_ENTERPRISE
if (FLAGS_coordinator) { if (FLAGS_coordinator) {
if (repl_query->role_ == ReplicationQuery::ReplicationRole::REPLICA) { throw QueryRuntimeException("Coordinator can't set roles!");
throw QueryRuntimeException("Coordinator cannot become a replica!"); }
} if (FLAGS_coordinator_server_port) {
throw QueryRuntimeException("Coordinator cannot become main!"); throw QueryRuntimeException("Can't set role manually on instance with coordinator server port.");
} }
#endif #endif
@ -900,6 +900,11 @@ Callback HandleReplicationQuery(ReplicationQuery *repl_query, const Parameters &
return callback; return callback;
} }
case ReplicationQuery::Action::REGISTER_REPLICA: { case ReplicationQuery::Action::REGISTER_REPLICA: {
#ifdef MG_ENTERPRISE
if (FLAGS_coordinator_server_port) {
throw QueryRuntimeException("Can't register replica manually on instance with coordinator server port.");
}
#endif
const auto &name = repl_query->instance_name_; const auto &name = repl_query->instance_name_;
const auto &sync_mode = repl_query->sync_mode_; const auto &sync_mode = repl_query->sync_mode_;
auto socket_address = repl_query->socket_address_->Accept(evaluator); auto socket_address = repl_query->socket_address_->Accept(evaluator);
@ -916,6 +921,11 @@ Callback HandleReplicationQuery(ReplicationQuery *repl_query, const Parameters &
} }
case ReplicationQuery::Action::DROP_REPLICA: { case ReplicationQuery::Action::DROP_REPLICA: {
#ifdef MG_ENTERPRISE
if (FLAGS_coordinator_server_port) {
throw QueryRuntimeException("Can't drop replica manually on instance with coordinator server port.");
}
#endif
const auto &name = repl_query->instance_name_; const auto &name = repl_query->instance_name_;
callback.fn = [handler = ReplQueryHandler{dbms_handler}, name]() mutable { callback.fn = [handler = ReplQueryHandler{dbms_handler}, name]() mutable {
handler.DropReplica(name); handler.DropReplica(name);