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

Add citus_set_coordinator_host

pull/4434/head
Marco Slot 2020-12-16 20:55:40 +01:00
parent ce344a54cb
commit 597533b1ff
13 changed files with 130 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,7 @@
#include "distributed/worker_manager.h"
#include "distributed/worker_transaction.h"
#include "lib/stringinfo.h"
#include "postmaster/postmaster.h"
#include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "storage/lock.h"
@ -110,7 +111,9 @@ static void ErrorIfCoordinatorMetadataSetFalse(WorkerNode *workerNode, Datum val
char *field);
static WorkerNode * SetShouldHaveShards(WorkerNode *workerNode, bool shouldHaveShards);
/* declarations for dynamic loading */
PG_FUNCTION_INFO_V1(citus_set_coordinator_host);
PG_FUNCTION_INFO_V1(master_add_node);
PG_FUNCTION_INFO_V1(master_add_inactive_node);
PG_FUNCTION_INFO_V1(master_add_secondary_node);
@ -141,6 +144,50 @@ DefaultNodeMetadata()
}
/*
* citus_set_coordinator_host configures the hostname and port through which worker
* nodes can connect to the coordinator.
*/
Datum
citus_set_coordinator_host(PG_FUNCTION_ARGS)
{
text *nodeName = PG_GETARG_TEXT_P(0);
int32 nodePort = PG_GETARG_INT32(1);
char *nodeNameString = text_to_cstring(nodeName);
NodeMetadata nodeMetadata = DefaultNodeMetadata();
nodeMetadata.groupId = 0;
nodeMetadata.shouldHaveShards = false;
nodeMetadata.nodeRole = PG_GETARG_OID(2);
Name nodeClusterName = PG_GETARG_NAME(3);
nodeMetadata.nodeCluster = NameStr(*nodeClusterName);
bool nodeAlreadyExists = false;
CheckCitusVersion(ERROR);
/* add the coordinator to pg_dist_node if it was not already added */
int nodeId = AddNodeMetadata(nodeNameString, nodePort, &nodeMetadata,
&nodeAlreadyExists);
if (nodeAlreadyExists)
{
/*
* since AddNodeMetadata takes an exclusive lock on pg_dist_node, we
* do not need to worry about concurrent changes (e.g. deletion) and
* can proceed to update immediately.
*/
UpdateNodeLocation(nodeId, nodeNameString, nodePort);
/* clear cached plans that have the old host/port */
ResetPlanCache();
}
PG_RETURN_VOID();
}
/*
* master_add_node function adds a new node to the cluster and returns its id. It also
* replicates all reference tables to the new node.

15
src/backend/distributed/operations/create_shards.c
View File

@ -173,7 +173,20 @@ CreateShardsWithRoundRobinPolicy(Oid distributedTableId, int32 shardCount,
/* load and sort the worker node list for deterministic placement */
List *workerNodeList = DistributedTablePlacementNodeList(NoLock);
workerNodeList = SortList(workerNodeList, CompareWorkerNodes);
if (list_length(workerNodeList) == 0)
{
/* fall back to using coordinator, if it is in the metadata */
WorkerNode *coordinatorNode = PrimaryNodeForGroup(COORDINATOR_GROUP_ID, NULL);
if (coordinatorNode != NULL)
{
workerNodeList = list_make1(coordinatorNode);
}
}
else
{
workerNodeList = SortList(workerNodeList, CompareWorkerNodes);
}
int32 workerNodeCount = list_length(workerNodeList);
if (replicationFactor > workerNodeCount)

1
src/backend/distributed/sql/citus--9.5-1--10.0-1.sql
View File

@ -8,6 +8,7 @@ DROP FUNCTION IF EXISTS pg_catalog.citus_total_relation_size(regclass);
#include "udfs/citus_finish_pg_upgrade/10.0-1.sql"
#include "udfs/undistribute_table/10.0-1.sql"
#include "udfs/create_citus_local_table/10.0-1.sql"
#include "udfs/citus_set_coordinator_host/10.0-1.sql"
#include "../../columnar/sql/columnar--9.5-1--10.0-1.sql"

2
src/backend/distributed/sql/downgrades/citus--10.0-1--9.5-1.sql
View File

@ -13,6 +13,8 @@ DROP FUNCTION pg_catalog.create_citus_local_table(regclass,boolean);
DROP VIEW pg_catalog.time_partitions;
DROP FUNCTION pg_catalog.time_partition_range(regclass);
DROP FUNCTION pg_catalog.citus_set_coordinator_host(text,int,noderole,name);
#include "../udfs/citus_total_relation_size/7.0-1.sql"
#include "../udfs/upgrade_to_reference_table/8.0-1.sql"
#include "../udfs/undistribute_table/9.5-1.sql"

13
src/backend/distributed/sql/udfs/citus_set_coordinator_host/10.0-1.sql generated Normal file
View File

@ -0,0 +1,13 @@
CREATE FUNCTION pg_catalog.citus_set_coordinator_host(
host text,
port integer default current_setting('port')::int,
node_role noderole default 'primary',
node_cluster name default 'default')
RETURNS VOID
LANGUAGE C STRICT
AS 'MODULE_PATHNAME', $$citus_set_coordinator_host$$;
COMMENT ON FUNCTION pg_catalog.citus_set_coordinator_host(text,integer,noderole,name)
IS 'set the host and port of the coordinator';
REVOKE ALL ON FUNCTION pg_catalog.citus_set_coordinator_host(text,int,noderole,name) FROM PUBLIC;

13
src/backend/distributed/sql/udfs/citus_set_coordinator_host/latest.sql Normal file
View File

@ -0,0 +1,13 @@
CREATE FUNCTION pg_catalog.citus_set_coordinator_host(
host text,
port integer default current_setting('port')::int,
node_role noderole default 'primary',
node_cluster name default 'default')
RETURNS VOID
LANGUAGE C STRICT
AS 'MODULE_PATHNAME', $$citus_set_coordinator_host$$;
COMMENT ON FUNCTION pg_catalog.citus_set_coordinator_host(text,integer,noderole,name)
IS 'set the host and port of the coordinator';
REVOKE ALL ON FUNCTION pg_catalog.citus_set_coordinator_host(text,int,noderole,name) FROM PUBLIC;

1
src/include/distributed/coordinator_protocol.h
View File

@ -167,6 +167,7 @@ extern int ShardMaxSize;
extern int ShardPlacementPolicy;
extern int NextShardId;
extern int NextPlacementId;
extern bool AddCoordinatorOnEmptyCluster;
extern bool IsCoordinator(void);

19
src/test/regress/expected/multi_extension.out
View File

@ -434,14 +434,8 @@ SELECT * FROM print_extension_changes();
-- Test downgrade to 9.5-1 from 10.0-1
ALTER EXTENSION citus UPDATE TO '10.0-1';
ALTER EXTENSION citus UPDATE TO '9.5-1';
ERROR: syntax error at or near ">>>>>>>"
-- Should be empty result since upgrade+downgrade should be a no-op
SELECT * FROM print_extension_changes();
previous_object | current_object
---------------------------------------------------------------------
(0 rows)
-- Snapshot of state at 10.0-1
ALTER EXTENSION citus UPDATE TO '10.0-1';
SELECT * FROM print_extension_changes();
previous_object | current_object
---------------------------------------------------------------------
@ -453,6 +447,7 @@ SELECT * FROM print_extension_changes();
| function alter_columnar_table_reset(regclass,boolean,boolean,boolean,boolean)
| function alter_columnar_table_set(regclass,integer,integer,name,integer)
| function citus_internal.columnar_ensure_objects_exist()
| function citus_set_coordinator_host(text,integer,noderole,name)
| function citus_total_relation_size(regclass,boolean)
| function columnar.columnar_handler(internal)
| function create_citus_local_table(regclass,boolean)
@ -465,7 +460,15 @@ SELECT * FROM print_extension_changes();
| table columnar.options
| view citus_tables
| view time_partitions
(20 rows)
(21 rows)
-- Snapshot of state at 10.0-1
ALTER EXTENSION citus UPDATE TO '10.0-1';
NOTICE: version "10.0-1" of extension "citus" is already installed
SELECT * FROM print_extension_changes();
previous_object | current_object
---------------------------------------------------------------------
(0 rows)
DROP TABLE prev_objects, extension_diff;
-- show running version

21
src/test/regress/expected/multi_extension_0.out
View File

@ -434,22 +434,17 @@ SELECT * FROM print_extension_changes();
-- Test downgrade to 9.5-1 from 10.0-1
ALTER EXTENSION citus UPDATE TO '10.0-1';
ALTER EXTENSION citus UPDATE TO '9.5-1';
ERROR: syntax error at or near ">>>>>>>"
-- Should be empty result since upgrade+downgrade should be a no-op
SELECT * FROM print_extension_changes();
previous_object | current_object
---------------------------------------------------------------------
(0 rows)
-- Snapshot of state at 10.0-1
ALTER EXTENSION citus UPDATE TO '10.0-1';
SELECT * FROM print_extension_changes();
previous_object | current_object
previous_object | current_object
---------------------------------------------------------------------
function citus_total_relation_size(regclass) |
function create_citus_local_table(regclass) |
function undistribute_table(regclass) |
function upgrade_to_reference_table(regclass) |
| function citus_internal.columnar_ensure_objects_exist()
| function citus_set_coordinator_host(text,integer,noderole,name)
| function citus_total_relation_size(regclass,boolean)
| function create_citus_local_table(regclass,boolean)
| function time_partition_range(regclass)
@ -461,7 +456,15 @@ SELECT * FROM print_extension_changes();
| table columnar.options
| view citus_tables
| view time_partitions
(16 rows)
(17 rows)
-- Snapshot of state at 10.0-1
ALTER EXTENSION citus UPDATE TO '10.0-1';
NOTICE: version "10.0-1" of extension "citus" is already installed
SELECT * FROM print_extension_changes();
previous_object | current_object
---------------------------------------------------------------------
(0 rows)
DROP TABLE prev_objects, extension_diff;
-- show running version

15
src/test/regress/expected/single_node.out
View File

@ -9,7 +9,7 @@ SELECT 1 FROM master_add_inactive_node('localhost', :master_port, groupid => 0);
ERROR: coordinator node cannot be added as inactive node
-- idempotently add node to allow this test to run without add_coordinator
SET client_min_messages TO WARNING;
SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0);
SELECT 1 FROM citus_set_coordinator_host('localhost', :master_port);
?column?
---------------------------------------------------------------------
1
@ -20,12 +20,6 @@ SELECT 1 FROM master_disable_node('localhost', :master_port);
ERROR: Disabling localhost:xxxxx failed
DETAIL: cannot change "isactive" field of the coordinator node
RESET client_min_messages;
SELECT 1 FROM master_set_node_property('localhost', :master_port, 'shouldhaveshards', true);
?column?
---------------------------------------------------------------------
1
(1 row)
CREATE TABLE test(x int, y int);
SELECT create_distributed_table('test','x');
create_distributed_table
@ -33,6 +27,13 @@ SELECT create_distributed_table('test','x');
(1 row)
-- should have shards setting should not matter for a single node
SELECT 1 FROM master_set_node_property('localhost', :master_port, 'shouldhaveshards', true);
?column?
---------------------------------------------------------------------
1
(1 row)
CREATE TYPE new_type AS (n int, m text);
CREATE TABLE test_2(x int, y int, z new_type);
SELECT create_distributed_table('test_2','x');

3
src/test/regress/expected/upgrade_list_citus_objects.out
View File

@ -56,6 +56,7 @@ ORDER BY 1;
function citus_relation_size(regclass)
function citus_remote_connection_stats()
function citus_server_id()
function citus_set_coordinator_host(text,integer,noderole,name)
function citus_set_default_rebalance_strategy(text)
function citus_shard_allowed_on_node_true(bigint,integer)
function citus_shard_cost_1(bigint)
@ -219,5 +220,5 @@ ORDER BY 1;
view citus_worker_stat_activity
view pg_dist_shard_placement
view time_partitions
(203 rows)
(204 rows)

3
src/test/regress/expected/upgrade_list_citus_objects_0.out
View File

@ -53,6 +53,7 @@ ORDER BY 1;
function citus_relation_size(regclass)
function citus_remote_connection_stats()
function citus_server_id()
function citus_set_coordinator_host(text,integer,noderole,name)
function citus_set_default_rebalance_strategy(text)
function citus_shard_allowed_on_node_true(bigint,integer)
function citus_shard_cost_1(bigint)
@ -215,5 +216,5 @@ ORDER BY 1;
view citus_worker_stat_activity
view pg_dist_shard_placement
view time_partitions
(199 rows)
(200 rows)

7
src/test/regress/sql/single_node.sql
View File

@ -10,18 +10,19 @@ SELECT 1 FROM master_add_inactive_node('localhost', :master_port, groupid => 0);
-- idempotently add node to allow this test to run without add_coordinator
SET client_min_messages TO WARNING;
SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0);
SELECT 1 FROM citus_set_coordinator_host('localhost', :master_port);
-- coordinator cannot be disabled
SELECT 1 FROM master_disable_node('localhost', :master_port);
RESET client_min_messages;
SELECT 1 FROM master_set_node_property('localhost', :master_port, 'shouldhaveshards', true);
CREATE TABLE test(x int, y int);
SELECT create_distributed_table('test','x');
-- should have shards setting should not matter for a single node
SELECT 1 FROM master_set_node_property('localhost', :master_port, 'shouldhaveshards', true);
CREATE TYPE new_type AS (n int, m text);
CREATE TABLE test_2(x int, y int, z new_type);
SELECT create_distributed_table('test_2','x');