From e35f4c836d944e227287f5e808e7a6a71270c93e Mon Sep 17 00:00:00 2001 From: Murat Tuncer Date: Fri, 6 Jan 2017 12:01:04 +0300 Subject: [PATCH] Address feedback --- src/backend/distributed/utils/node_metadata.c | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/backend/distributed/utils/node_metadata.c b/src/backend/distributed/utils/node_metadata.c index 2b07fd432..e6174dc30 100644 --- a/src/backend/distributed/utils/node_metadata.c +++ b/src/backend/distributed/utils/node_metadata.c @@ -121,19 +121,22 @@ master_remove_node(PG_FUNCTION_ARGS) EnsureSuperUser(); hasShardPlacements = NodeHasActiveShardPlacements(nodeNameString, nodePort); - if (hasShardPlacements && force) + if (hasShardPlacements) { - ereport(NOTICE, (errmsg("Node %s:%d has active shard placements. Some " - "queries may fail after this operation. Use " - "select master_add_node('%s', %d) to add this " - "node back.", - nodeNameString, nodePort, nodeNameString, - nodePort))); - } - else if (hasShardPlacements) - { - ereport(ERROR, (errmsg("you cannot remove a node which has active " - "shard placements"))); + if (force) + { + ereport(NOTICE, (errmsg("Node %s:%d has active shard placements. Some " + "queries may fail after this operation. Use " + "select master_add_node('%s', %d) to add this " + "node back.", + nodeNameString, nodePort, nodeNameString, + nodePort))); + } + else + { + ereport(ERROR, (errmsg("you cannot remove a node which has active " + "shard placements"))); + } } workerNode = FindWorkerNode(nodeNameString, nodePort);