external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patches #5758 with some more error checks (#5804) 

Add error checks to detect failed connection and don't ping secondary nodes to detect self reference.
pull/5809/head
Gledis Zeneli 2022-03-15 15:02:47 +03:00 committed by GitHub
parent 5fd0ec7dab
commit 56ab64b747
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/backend/distributed/metadata/node_metadata.c
View File

@ -283,6 +283,7 @@ citus_add_node(PG_FUNCTION_ARGS)
*/ */
if (workerNode != NULL && if (workerNode != NULL &&
workerNode->groupId != COORDINATOR_GROUP_ID && workerNode->groupId != COORDINATOR_GROUP_ID &&
workerNode->nodeRole != SecondaryNodeRoleId() &&
IsWorkerTheCurrentNode(workerNode)) IsWorkerTheCurrentNode(workerNode))
{ {
ereport(ERROR, (errmsg("Node cannot add itself as a worker."), ereport(ERROR, (errmsg("Node cannot add itself as a worker."),

9
src/backend/distributed/transaction/worker_transaction.c
View File

@ -658,10 +658,17 @@ IsWorkerTheCurrentNode(WorkerNode *workerNode)
workerNode->workerPort, workerNode->workerPort,
CurrentUserName(), CurrentUserName(),
NULL); NULL);
const char *command = const char *command =
"SELECT metadata ->> 'server_id' AS server_id FROM pg_dist_node_metadata"; "SELECT metadata ->> 'server_id' AS server_id FROM pg_dist_node_metadata";
SendRemoteCommand(workerConnection, command); int resultCode = SendRemoteCommand(workerConnection, command);
if (resultCode == 0)
{
CloseConnection(workerConnection);
return false;
}
PGresult *result = GetRemoteCommandResult(workerConnection, true); PGresult *result = GetRemoteCommandResult(workerConnection, true);