From c12bd7b75e2800940f2a217a9ac310794b73df76 Mon Sep 17 00:00:00 2001 From: Murat Tuncer Date: Wed, 18 Jan 2017 16:42:16 +0300 Subject: [PATCH] Remove hint message from master_remove_node UDF Hint about master_disable_node was giving wrong impression to users. Removal is better than keeping it. --- src/backend/distributed/utils/node_metadata.c | 3 +-- src/test/regress/expected/multi_cluster_management.out | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/backend/distributed/utils/node_metadata.c b/src/backend/distributed/utils/node_metadata.c index 4ea766ec8..f8bb96931 100644 --- a/src/backend/distributed/utils/node_metadata.c +++ b/src/backend/distributed/utils/node_metadata.c @@ -411,8 +411,7 @@ RemoveNodeFromCluster(char *nodeName, int32 nodePort, bool forceRemove) else { ereport(ERROR, (errmsg("you cannot remove a node which has active " - "shard placements"), - errhint("Consider using master_disable_node."))); + "shard placements"))); } } diff --git a/src/test/regress/expected/multi_cluster_management.out b/src/test/regress/expected/multi_cluster_management.out index f0f3cb18e..12495eb82 100644 --- a/src/test/regress/expected/multi_cluster_management.out +++ b/src/test/regress/expected/multi_cluster_management.out @@ -113,7 +113,6 @@ SELECT shardid, shardstate, nodename, nodeport FROM pg_dist_shard_placement WHER -- try to remove a node with active placements and see that node removal is failed SELECT master_remove_node('localhost', :worker_2_port); ERROR: you cannot remove a node which has active shard placements -HINT: Consider using master_disable_node. SELECT master_get_active_worker_nodes(); master_get_active_worker_nodes -------------------------------- @@ -148,7 +147,6 @@ SELECT master_add_node('localhost', :worker_2_port); -- try to remove a node with active placements and see that node removal is failed SELECT master_remove_node('localhost', :worker_2_port); ERROR: you cannot remove a node which has active shard placements -HINT: Consider using master_disable_node. -- mark all placements in the candidate node as inactive UPDATE pg_dist_shard_placement SET shardstate=3 WHERE nodeport=:worker_2_port; SELECT shardid, shardstate, nodename, nodeport FROM pg_dist_shard_placement WHERE nodeport=:worker_2_port;