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

Prevent empty placement creation in the coordinator

issue4237-2
naisila 2020-12-11 22:40:38 +03:00
parent 7e30e717ef
commit fd5418b91e
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/distributed/operations/stage_protocol.c
View File

@ -165,10 +165,11 @@ master_create_empty_shard(PG_FUNCTION_ARGS)
/* generate new and unique shardId from sequence */ /* generate new and unique shardId from sequence */
uint64 shardId = GetNextShardId(); uint64 shardId = GetNextShardId();
/* if enough live groups, add an extra candidate node as backup */
List *workerNodeList = AppendDistributedTablePlacementNodeList(NoLock); List *workerNodeList = AppendDistributedTablePlacementNodeList(NoLock);
int workerNodeListLength = list_length(workerNodeList);
if (list_length(workerNodeList) > ShardReplicationFactor) /* if enough live groups, add an extra candidate node as backup */
if (workerNodeListLength > ShardReplicationFactor)
{ {
attemptableNodeCount = ShardReplicationFactor + 1; attemptableNodeCount = ShardReplicationFactor + 1;
} }
@ -177,6 +178,17 @@ master_create_empty_shard(PG_FUNCTION_ARGS)
attemptableNodeCount = ShardReplicationFactor; attemptableNodeCount = ShardReplicationFactor;
} }
/* check if we are trying to create an empty placement on the coordinator */
if(workerNodeListLength + 1 == ShardReplicationFactor)
{
List *fullWorkerNodeList = DistributedTablePlacementNodeList(NoLock);
if(list_length(fullWorkerNodeList) == ShardReplicationFactor)
{
ereport(ERROR, (errmsg("Cannot create an empty placement on the coordinator."),
errhint("Reduce shard replication factor or add a worker node.")));
}
}
/* first retrieve a list of random nodes for shard placements */ /* first retrieve a list of random nodes for shard placements */
while (candidateNodeIndex < attemptableNodeCount) while (candidateNodeIndex < attemptableNodeCount)
{ {

11
src/backend/distributed/operations/worker_node_manager.c
View File

@ -267,7 +267,8 @@ ClientHostAddress(StringInfo clientHostStringInfo)
/* /*
* WorkerGetNodeWithName finds and returns a node from the membership list that * WorkerGetNodeWithName finds and returns a node from the membership list that
* has the given hostname. The function returns null if no such node exists. * has the given hostname. The node cannot be the coordinator.
* The function returns null if no such node exists.
*/ */
static WorkerNode * static WorkerNode *
WorkerGetNodeWithName(const char *hostname) WorkerGetNodeWithName(const char *hostname)
@ -281,7 +282,7 @@ WorkerGetNodeWithName(const char *hostname)
while ((workerNode = hash_seq_search(&status)) != NULL) while ((workerNode = hash_seq_search(&status)) != NULL)
{ {
int nameCompare = strncmp(workerNode->workerName, hostname, WORKER_LENGTH); int nameCompare = strncmp(workerNode->workerName, hostname, WORKER_LENGTH);
if (nameCompare == 0) if (nameCompare == 0 && (workerNode->groupId != 0))
{ {
/* we need to terminate the scan since we break */ /* we need to terminate the scan since we break */
hash_seq_term(&status); hash_seq_term(&status);
@ -579,8 +580,8 @@ NodeIsReadableWorker(WorkerNode *node)
/* /*
* PrimaryNodesNotInList scans through the worker node hash and returns a list of all * PrimaryNodesNotInList scans through the worker node hash and returns a list of all
* primary nodes which are not in currentList. It runs in O(n*m) but currentList is * primary nodes which are not in currentList and are not the coordinator.
* quite small. * It runs in O(n*m) but currentList is quite small.
*/ */
static List * static List *
PrimaryNodesNotInList(List *currentList) PrimaryNodesNotInList(List *currentList)
@ -599,7 +600,7 @@ PrimaryNodesNotInList(List *currentList)
continue; continue;
} }
if (NodeIsPrimary(workerNode)) if (NodeIsPrimary(workerNode) && (workerNode->groupId != 0))
{ {
workerNodeList = lappend(workerNodeList, workerNode); workerNodeList = lappend(workerNodeList, workerNode);
} }