Add noderole to pg_dist_node

pull/1235/head
Brian Cloutier 2017-02-15 10:31:31 +03:00
parent 5184fc1d92
commit f79d7a1f4d
18 changed files with 212 additions and 160 deletions

View File

@ -9,7 +9,7 @@ EXTVERSIONS = 5.0 5.0-1 5.0-2 \
5.1-1 5.1-2 5.1-3 5.1-4 5.1-5 5.1-6 5.1-7 5.1-8 \
5.2-1 5.2-2 5.2-3 5.2-4 \
6.0-1 6.0-2 6.0-3 6.0-4 6.0-5 6.0-6 6.0-7 6.0-8 6.0-9 6.0-10 6.0-11 6.0-12 6.0-13 6.0-14 6.0-15 6.0-16 6.0-17 6.0-18 \
6.1-1 6.1-2 6.1-3 6.1-4 6.1-5 6.1-6 6.1-7 6.1-8 6.1-9 6.1-10 6.1-11 6.1-12 6.1-13 6.1-14 6.1-15 6.1-16 6.1-17
6.1-1 6.1-2 6.1-3 6.1-4 6.1-5 6.1-6 6.1-7 6.1-8 6.1-9 6.1-10 6.1-11 6.1-12 6.1-13 6.1-14 6.1-15 6.1-16 6.1-17 6.1-18
# All citus--*.sql files in the source directory
DATA = $(patsubst $(citus_abs_srcdir)/%.sql,%.sql,$(wildcard $(citus_abs_srcdir)/$(EXTENSION)--*--*.sql))
@ -129,6 +129,8 @@ $(EXTENSION)--6.1-16.sql: $(EXTENSION)--6.1-15.sql $(EXTENSION)--6.1-15--6.1-16.
cat $^ > $@
$(EXTENSION)--6.1-17.sql: $(EXTENSION)--6.1-16.sql $(EXTENSION)--6.1-16--6.1-17.sql
cat $^ > $@
$(EXTENSION)--6.1-18.sql: $(EXTENSION)--6.1-17.sql $(EXTENSION)--6.1-17--6.1-18.sql
cat $^ > $@
NO_PGXS = 1

View File

@ -0,0 +1,24 @@
/* citus--6.1-17--6.1-18.sql */
SET search_path = 'pg_catalog';
ALTER TABLE pg_dist_node ADD COLUMN noderole "char" NOT NULL DEFAULT 'p';
DROP FUNCTION IF EXISTS master_add_node(text, integer);
CREATE FUNCTION master_add_node(nodename text,
nodeport integer,
OUT nodeid integer,
OUT groupid integer,
OUT nodename text,
OUT nodeport integer,
OUT noderack text,
OUT hasmetadata boolean,
OUT noderole "char")
RETURNS record
LANGUAGE C STRICT
AS 'MODULE_PATHNAME', $$master_add_node$$;
COMMENT ON FUNCTION master_add_node(nodename text, nodeport integer)
IS 'add node to the cluster';
RESET search_path;

View File

@ -1,6 +1,6 @@
# Citus extension
comment = 'Citus distributed database'
default_version = '6.1-17'
default_version = '6.1-18'
module_pathname = '$libdir/citus'
relocatable = false
schema = pg_catalog

View File

@ -399,7 +399,7 @@ NodeListInsertCommand(List *workerNodeList)
/* generate the query without any values yet */
appendStringInfo(nodeListInsertCommand,
"INSERT INTO pg_dist_node "
"(nodeid, groupid, nodename, nodeport, noderack, hasmetadata) "
"(nodeid, groupid, nodename, nodeport, noderack, hasmetadata, noderole) "
"VALUES ");
/* iterate over the worker nodes, add the values */
@ -409,13 +409,14 @@ NodeListInsertCommand(List *workerNodeList)
char *hasMetadaString = workerNode->hasMetadata ? "TRUE" : "FALSE";
appendStringInfo(nodeListInsertCommand,
"(%d, %d, %s, %d, %s, %s)",
"(%d, %d, %s, %d, %s, %s, '%c')",
workerNode->nodeId,
workerNode->groupId,
quote_literal_cstr(workerNode->workerName),
workerNode->workerPort,
quote_literal_cstr(workerNode->workerRack),
hasMetadaString);
hasMetadaString,
workerNode->nodeRole);
processedWorkerNodeCount++;
if (processedWorkerNodeCount != workerCount)

View File

@ -1625,6 +1625,7 @@ InitializeWorkerNodeCache(void)
workerNode->nodeId = currentNode->nodeId;
strlcpy(workerNode->workerRack, currentNode->workerRack, WORKER_LENGTH);
workerNode->hasMetadata = currentNode->hasMetadata;
workerNode->nodeRole = currentNode->nodeRole;
if (handleFound)
{

View File

@ -53,13 +53,14 @@ int GroupSize = 1;
/* local function forward declarations */
static void RemoveNodeFromCluster(char *nodeName, int32 nodePort, bool forceRemove);
static Datum AddNodeMetadata(char *nodeName, int32 nodePort, int32 groupId,
char *nodeRack, bool hasMetadata, bool *nodeAlreadyExists);
char *nodeRack, bool hasMetadata, char noderole,
bool *nodeAlreadyExists);
static Datum GenerateNodeTuple(WorkerNode *workerNode);
static int32 GetNextGroupId(void);
static uint32 GetMaxGroupId(void);
static int GetNextNodeId(void);
static void InsertNodeRow(int nodeid, char *nodename, int32 nodeport, uint32 groupId,
char *nodeRack, bool hasMetadata);
char *nodeRack, bool hasMetadata, char noderole);
static void DeleteNodeRow(char *nodename, int32 nodeport);
static List * ParseWorkerNodeFileAndRename(void);
static WorkerNode * TupleToWorkerNode(TupleDesc tupleDescriptor, HeapTuple heapTuple);
@ -88,7 +89,8 @@ master_add_node(PG_FUNCTION_ARGS)
bool nodeAlreadyExists = false;
Datum returnData = AddNodeMetadata(nodeNameString, nodePort, groupId, nodeRack,
hasMetadata, &nodeAlreadyExists);
hasMetadata, NODE_ROLE_PRIMARY,
&nodeAlreadyExists);
/*
* After adding new node, if the node is not already exist, we replicate all existing
@ -166,7 +168,8 @@ master_initialize_node_metadata(PG_FUNCTION_ARGS)
WorkerNode *workerNode = (WorkerNode *) lfirst(workerNodeCell);
AddNodeMetadata(workerNode->workerName, workerNode->workerPort, 0,
workerNode->workerRack, false, &nodeAlreadyExists);
workerNode->workerRack, false, NODE_ROLE_PRIMARY,
&nodeAlreadyExists);
}
PG_RETURN_BOOL(true);
@ -414,7 +417,7 @@ RemoveNodeFromCluster(char *nodeName, int32 nodePort, bool forceRemove)
*/
static Datum
AddNodeMetadata(char *nodeName, int32 nodePort, int32 groupId, char *nodeRack,
bool hasMetadata, bool *nodeAlreadyExists)
bool hasMetadata, char noderole, bool *nodeAlreadyExists)
{
Relation pgDistNode = NULL;
int nextNodeIdInt = 0;
@ -465,7 +468,8 @@ AddNodeMetadata(char *nodeName, int32 nodePort, int32 groupId, char *nodeRack,
/* generate the new node id from the sequence */
nextNodeIdInt = GetNextNodeId();
InsertNodeRow(nextNodeIdInt, nodeName, nodePort, groupId, nodeRack, hasMetadata);
InsertNodeRow(nextNodeIdInt, nodeName, nodePort, groupId,
nodeRack, hasMetadata, noderole);
workerNode = FindWorkerNode(nodeName, nodePort);
@ -512,6 +516,7 @@ GenerateNodeTuple(WorkerNode *workerNode)
values[Anum_pg_dist_node_nodeport - 1] = UInt32GetDatum(workerNode->workerPort);
values[Anum_pg_dist_node_noderack - 1] = CStringGetTextDatum(workerNode->workerRack);
values[Anum_pg_dist_node_hasmetadata - 1] = BoolGetDatum(workerNode->hasMetadata);
values[Anum_pg_dist_node_noderole - 1] = CharGetDatum(workerNode->nodeRole);
/* open shard relation and insert new tuple */
pgDistNode = heap_open(DistNodeRelationId(), AccessShareLock);
@ -650,7 +655,7 @@ EnsureCoordinator(void)
*/
static void
InsertNodeRow(int nodeid, char *nodeName, int32 nodePort, uint32 groupId, char *nodeRack,
bool hasMetadata)
bool hasMetadata, char noderole)
{
Relation pgDistNode = NULL;
TupleDesc tupleDescriptor = NULL;
@ -668,6 +673,7 @@ InsertNodeRow(int nodeid, char *nodeName, int32 nodePort, uint32 groupId, char *
values[Anum_pg_dist_node_nodeport - 1] = UInt32GetDatum(nodePort);
values[Anum_pg_dist_node_noderack - 1] = CStringGetTextDatum(nodeRack);
values[Anum_pg_dist_node_hasmetadata - 1] = BoolGetDatum(hasMetadata);
values[Anum_pg_dist_node_noderole - 1] = CharGetDatum(noderole);
/* open shard relation and insert new tuple */
pgDistNode = heap_open(DistNodeRelationId(), AccessExclusiveLock);
@ -867,6 +873,7 @@ ParseWorkerNodeFileAndRename()
strlcpy(workerNode->workerRack, nodeRack, WORKER_LENGTH);
workerNode->workerPort = nodePort;
workerNode->hasMetadata = false;
workerNode->nodeRole = NODE_ROLE_PRIMARY;
workerNodeList = lappend(workerNodeList, workerNode);
}
@ -906,6 +913,14 @@ TupleToWorkerNode(TupleDesc tupleDescriptor, HeapTuple heapTuple)
tupleDescriptor, &isNull);
Datum hasMetadata = heap_getattr(heapTuple, Anum_pg_dist_node_hasmetadata,
tupleDescriptor, &isNull);
Datum nodeRole = heap_getattr(heapTuple, Anum_pg_dist_node_noderole,
tupleDescriptor, &isNull);
/* since the column doesn't exist yet assume it references a primary */
if (HeapTupleHeaderGetNatts(heapTuple->t_data) < Anum_pg_dist_node_noderole)
{
nodeRole = CharGetDatum(NODE_ROLE_PRIMARY);
}
Assert(!HeapTupleHasNulls(heapTuple));
@ -916,6 +931,7 @@ TupleToWorkerNode(TupleDesc tupleDescriptor, HeapTuple heapTuple)
strlcpy(workerNode->workerName, TextDatumGetCString(nodeName), WORKER_LENGTH);
strlcpy(workerNode->workerRack, TextDatumGetCString(nodeRack), WORKER_LENGTH);
workerNode->hasMetadata = DatumGetBool(hasMetadata);
workerNode->nodeRole = DatumGetChar(nodeRole);
return workerNode;
}

View File

@ -23,6 +23,7 @@ typedef struct FormData_pg_dist_node
text nodename;
int nodeport;
bool hasmetadata;
char noderole; /* see codes below */
#endif
} FormData_pg_dist_node;
@ -37,15 +38,19 @@ typedef FormData_pg_dist_node *Form_pg_dist_node;
* compiler constants for pg_dist_node
* ----------------
*/
#define Natts_pg_dist_node 6
#define Natts_pg_dist_node 7
#define Anum_pg_dist_node_nodeid 1
#define Anum_pg_dist_node_groupid 2
#define Anum_pg_dist_node_nodename 3
#define Anum_pg_dist_node_nodeport 4
#define Anum_pg_dist_node_noderack 5
#define Anum_pg_dist_node_hasmetadata 6
#define Anum_pg_dist_node_noderole 7
#define GROUPID_SEQUENCE_NAME "pg_dist_groupid_seq"
#define NODEID_SEQUENCE_NAME "pg_dist_node_nodeid_seq"
#define NODE_ROLE_PRIMARY 'p'
#define NODE_ROLE_SECONDARY 's'
#endif /* PG_DIST_NODE_H */

View File

@ -43,6 +43,7 @@ typedef struct WorkerNode
uint32 groupId; /* node's groupId; same for the nodes that are in the same group */
char workerRack[WORKER_LENGTH]; /* node's network location */
bool hasMetadata; /* node gets metadata changes */
char nodeRole; /* whether the node is a primary or secondary */
} WorkerNode;

View File

@ -10,14 +10,14 @@ DETAIL: There are no active worker nodes.
-- add the nodes to the cluster
SELECT master_add_node('localhost', :worker_1_port);
master_add_node
---------------------------------
(1,1,localhost,57637,default,f)
-----------------------------------
(1,1,localhost,57637,default,f,p)
(1 row)
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
---------------------------------
(2,2,localhost,57638,default,f)
-----------------------------------
(2,2,localhost,57638,default,f,p)
(1 row)
-- get the active nodes
@ -30,9 +30,9 @@ SELECT master_get_active_worker_nodes();
-- try to add a node that is already in the cluster
SELECT * FROM master_add_node('localhost', :worker_1_port);
nodeid | groupid | nodename | nodeport | noderack | hasmetadata
--------+---------+-----------+----------+----------+-------------
1 | 1 | localhost | 57637 | default | f
nodeid | groupid | nodename | nodeport | noderack | hasmetadata | noderole
--------+---------+-----------+----------+----------+-------------+----------
1 | 1 | localhost | 57637 | default | f | p
(1 row)
-- get the active nodes
@ -60,8 +60,8 @@ SELECT master_get_active_worker_nodes();
-- try to disable a node with no placements see that node is removed
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
---------------------------------
(3,3,localhost,57638,default,f)
-----------------------------------
(3,3,localhost,57638,default,f,p)
(1 row)
SELECT master_disable_node('localhost', :worker_2_port);
@ -79,8 +79,8 @@ SELECT master_get_active_worker_nodes();
-- add some shard placements to the cluster
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
---------------------------------
(4,4,localhost,57638,default,f)
-----------------------------------
(4,4,localhost,57638,default,f,p)
(1 row)
CREATE TABLE cluster_management_test (col_1 text, col_2 int);
@ -140,8 +140,8 @@ SELECT master_get_active_worker_nodes();
-- restore the node for next tests
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
---------------------------------
(5,5,localhost,57638,default,f)
-----------------------------------
(5,5,localhost,57638,default,f,p)
(1 row)
-- try to remove a node with active placements and see that node removal is failed
@ -178,8 +178,8 @@ SELECT master_get_active_worker_nodes();
-- clean-up
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
---------------------------------
(6,6,localhost,57638,default,f)
-----------------------------------
(6,6,localhost,57638,default,f,p)
(1 row)
UPDATE pg_dist_shard_placement SET shardstate=1 WHERE nodeport=:worker_2_port;
@ -194,8 +194,8 @@ SELECT master_remove_node('localhost', :worker_2_port);
UPDATE pg_dist_node SET hasmetadata=true WHERE nodeport=:worker_1_port;
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
---------------------------------
(7,7,localhost,57638,default,f)
-----------------------------------
(7,7,localhost,57638,default,f,p)
(1 row)
\c - - - :worker_1_port
@ -223,8 +223,8 @@ SELECT nodename, nodeport FROM pg_dist_node WHERE nodename='localhost' AND nodep
UPDATE pg_dist_node SET hasmetadata=false WHERE nodeport=:worker_1_port;
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
---------------------------------
(8,8,localhost,57638,default,f)
-----------------------------------
(8,8,localhost,57638,default,f,p)
(1 row)
\c - - - :worker_1_port
@ -244,8 +244,8 @@ SELECT
(1 row)
SELECT * FROM pg_dist_node ORDER BY nodeid;
nodeid | groupid | nodename | nodeport | noderack | hasmetadata
--------+---------+----------+----------+----------+-------------
nodeid | groupid | nodename | nodeport | noderack | hasmetadata | noderole
--------+---------+----------+----------+----------+-------------+----------
(0 rows)
-- check that adding two nodes in the same transaction works
@ -253,15 +253,15 @@ SELECT
master_add_node('localhost', :worker_1_port),
master_add_node('localhost', :worker_2_port);
master_add_node | master_add_node
---------------------------------+-----------------------------------
(9,9,localhost,57637,default,f) | (10,10,localhost,57638,default,f)
-----------------------------------+-------------------------------------
(9,9,localhost,57637,default,f,p) | (10,10,localhost,57638,default,f,p)
(1 row)
SELECT * FROM pg_dist_node ORDER BY nodeid;
nodeid | groupid | nodename | nodeport | noderack | hasmetadata
--------+---------+-----------+----------+----------+-------------
9 | 9 | localhost | 57637 | default | f
10 | 10 | localhost | 57638 | default | f
nodeid | groupid | nodename | nodeport | noderack | hasmetadata | noderole
--------+---------+-----------+----------+----------+-------------+----------
9 | 9 | localhost | 57637 | default | f | p
10 | 10 | localhost | 57638 | default | f | p
(2 rows)
-- check that mixed add/remove node commands work fine inside transaction
@ -274,8 +274,8 @@ SELECT master_remove_node('localhost', :worker_2_port);
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
-----------------------------------
(11,11,localhost,57638,default,f)
-------------------------------------
(11,11,localhost,57638,default,f,p)
(1 row)
SELECT master_remove_node('localhost', :worker_2_port);
@ -294,8 +294,8 @@ UPDATE pg_dist_node SET hasmetadata=true WHERE nodeport=:worker_1_port;
BEGIN;
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
-----------------------------------
(12,12,localhost,57638,default,f)
-------------------------------------
(12,12,localhost,57638,default,f,p)
(1 row)
SELECT master_remove_node('localhost', :worker_2_port);
@ -306,8 +306,8 @@ SELECT master_remove_node('localhost', :worker_2_port);
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
-----------------------------------
(13,13,localhost,57638,default,f)
-------------------------------------
(13,13,localhost,57638,default,f,p)
(1 row)
COMMIT;
@ -334,14 +334,14 @@ SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node;
SELECT master_add_node('localhost', :worker_1_port);
master_add_node
-----------------------------------
(14,14,localhost,57637,default,f)
-------------------------------------
(14,14,localhost,57637,default,f,p)
(1 row)
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
-----------------------------------
(15,15,localhost,57638,default,f)
-------------------------------------
(15,15,localhost,57638,default,f,p)
(1 row)
-- check that a distributed table can be created after adding a node in a transaction
@ -354,8 +354,8 @@ SELECT master_remove_node('localhost', :worker_2_port);
BEGIN;
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
-----------------------------------
(16,16,localhost,57638,default,f)
-------------------------------------
(16,16,localhost,57638,default,f,p)
(1 row)
CREATE TABLE temp(col1 text, col2 int);

View File

@ -22,14 +22,14 @@ CREATE EXTENSION citus;
-- re-add the nodes to the cluster
SELECT master_add_node('localhost', :worker_1_port);
master_add_node
---------------------------------
(1,1,localhost,57637,default,f)
-----------------------------------
(1,1,localhost,57637,default,f,p)
(1 row)
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
---------------------------------
(2,2,localhost,57638,default,f)
-----------------------------------
(2,2,localhost,57638,default,f,p)
(1 row)
-- verify that a table can be created after the extension has been dropped and recreated

View File

@ -75,6 +75,7 @@ ALTER EXTENSION citus UPDATE TO '6.1-14';
ALTER EXTENSION citus UPDATE TO '6.1-15';
ALTER EXTENSION citus UPDATE TO '6.1-16';
ALTER EXTENSION citus UPDATE TO '6.1-17';
ALTER EXTENSION citus UPDATE TO '6.1-18';
-- ensure no objects were created outside pg_catalog
SELECT COUNT(*)
FROM pg_depend AS pgd,

View File

@ -29,10 +29,10 @@ SELECT * FROM pg_dist_partition WHERE partmethod='h' AND repmodel='s';
-- pg_dist_node entries and reference tables
SELECT unnest(master_metadata_snapshot());
unnest
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TRUNCATE pg_dist_node
SELECT worker_drop_distributed_table(logicalrelid) FROM pg_dist_partition
INSERT INTO pg_dist_node (nodeid, groupid, nodename, nodeport, noderack, hasmetadata) VALUES (2, 2, 'localhost', 57638, 'default', FALSE),(1, 1, 'localhost', 57637, 'default', FALSE)
INSERT INTO pg_dist_node (nodeid, groupid, nodename, nodeport, noderack, hasmetadata, noderole) VALUES (2, 2, 'localhost', 57638, 'default', FALSE, 'p'),(1, 1, 'localhost', 57637, 'default', FALSE, 'p')
(3 rows)
-- Create a test table with constraints and SERIAL
@ -58,7 +58,7 @@ SELECT unnest(master_metadata_snapshot());
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TRUNCATE pg_dist_node
SELECT worker_drop_distributed_table(logicalrelid) FROM pg_dist_partition
INSERT INTO pg_dist_node (nodeid, groupid, nodename, nodeport, noderack, hasmetadata) VALUES (2, 2, 'localhost', 57638, 'default', FALSE),(1, 1, 'localhost', 57637, 'default', FALSE)
INSERT INTO pg_dist_node (nodeid, groupid, nodename, nodeport, noderack, hasmetadata, noderole) VALUES (2, 2, 'localhost', 57638, 'default', FALSE, 'p'),(1, 1, 'localhost', 57637, 'default', FALSE, 'p')
SELECT worker_apply_sequence_command ('CREATE SEQUENCE IF NOT EXISTS mx_test_table_col_3_seq INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START WITH 1 NO CYCLE')
ALTER SEQUENCE public.mx_test_table_col_3_seq OWNER TO postgres
CREATE SEQUENCE IF NOT EXISTS public.mx_test_table_col_3_seq INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START WITH 1 NO CYCLE
@ -80,7 +80,7 @@ SELECT unnest(master_metadata_snapshot());
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TRUNCATE pg_dist_node
SELECT worker_drop_distributed_table(logicalrelid) FROM pg_dist_partition
INSERT INTO pg_dist_node (nodeid, groupid, nodename, nodeport, noderack, hasmetadata) VALUES (2, 2, 'localhost', 57638, 'default', FALSE),(1, 1, 'localhost', 57637, 'default', FALSE)
INSERT INTO pg_dist_node (nodeid, groupid, nodename, nodeport, noderack, hasmetadata, noderole) VALUES (2, 2, 'localhost', 57638, 'default', FALSE, 'p'),(1, 1, 'localhost', 57637, 'default', FALSE, 'p')
SELECT worker_apply_sequence_command ('CREATE SEQUENCE IF NOT EXISTS mx_test_table_col_3_seq INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START WITH 1 NO CYCLE')
ALTER SEQUENCE public.mx_test_table_col_3_seq OWNER TO postgres
CREATE SEQUENCE IF NOT EXISTS public.mx_test_table_col_3_seq INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START WITH 1 NO CYCLE
@ -104,7 +104,7 @@ SELECT unnest(master_metadata_snapshot());
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TRUNCATE pg_dist_node
SELECT worker_drop_distributed_table(logicalrelid) FROM pg_dist_partition
INSERT INTO pg_dist_node (nodeid, groupid, nodename, nodeport, noderack, hasmetadata) VALUES (2, 2, 'localhost', 57638, 'default', FALSE),(1, 1, 'localhost', 57637, 'default', FALSE)
INSERT INTO pg_dist_node (nodeid, groupid, nodename, nodeport, noderack, hasmetadata, noderole) VALUES (2, 2, 'localhost', 57638, 'default', FALSE, 'p'),(1, 1, 'localhost', 57637, 'default', FALSE, 'p')
CREATE SCHEMA IF NOT EXISTS mx_testing_schema AUTHORIZATION postgres
SELECT worker_apply_sequence_command ('CREATE SEQUENCE IF NOT EXISTS mx_testing_schema.mx_test_table_col_3_seq INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START WITH 1 NO CYCLE')
ALTER SEQUENCE mx_testing_schema.mx_test_table_col_3_seq OWNER TO postgres
@ -134,7 +134,7 @@ SELECT unnest(master_metadata_snapshot());
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TRUNCATE pg_dist_node
SELECT worker_drop_distributed_table(logicalrelid) FROM pg_dist_partition
INSERT INTO pg_dist_node (nodeid, groupid, nodename, nodeport, noderack, hasmetadata) VALUES (2, 2, 'localhost', 57638, 'default', FALSE),(1, 1, 'localhost', 57637, 'default', FALSE)
INSERT INTO pg_dist_node (nodeid, groupid, nodename, nodeport, noderack, hasmetadata, noderole) VALUES (2, 2, 'localhost', 57638, 'default', FALSE, 'p'),(1, 1, 'localhost', 57637, 'default', FALSE, 'p')
CREATE SCHEMA IF NOT EXISTS mx_testing_schema AUTHORIZATION postgres
SELECT worker_apply_sequence_command ('CREATE SEQUENCE IF NOT EXISTS mx_testing_schema.mx_test_table_col_3_seq INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START WITH 1 NO CYCLE')
ALTER SEQUENCE mx_testing_schema.mx_test_table_col_3_seq OWNER TO postgres
@ -157,7 +157,7 @@ SELECT unnest(master_metadata_snapshot());
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TRUNCATE pg_dist_node
SELECT worker_drop_distributed_table(logicalrelid) FROM pg_dist_partition
INSERT INTO pg_dist_node (nodeid, groupid, nodename, nodeport, noderack, hasmetadata) VALUES (2, 2, 'localhost', 57638, 'default', FALSE),(1, 1, 'localhost', 57637, 'default', FALSE)
INSERT INTO pg_dist_node (nodeid, groupid, nodename, nodeport, noderack, hasmetadata, noderole) VALUES (2, 2, 'localhost', 57638, 'default', FALSE, 'p'),(1, 1, 'localhost', 57637, 'default', FALSE, 'p')
CREATE SCHEMA IF NOT EXISTS mx_testing_schema AUTHORIZATION postgres
SELECT worker_apply_sequence_command ('CREATE SEQUENCE IF NOT EXISTS mx_testing_schema.mx_test_table_col_3_seq INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START WITH 1 NO CYCLE')
ALTER SEQUENCE mx_testing_schema.mx_test_table_col_3_seq OWNER TO postgres
@ -203,10 +203,10 @@ SELECT * FROM pg_dist_local_group;
(1 row)
SELECT * FROM pg_dist_node ORDER BY nodeid;
nodeid | groupid | nodename | nodeport | noderack | hasmetadata
--------+---------+-----------+----------+----------+-------------
1 | 1 | localhost | 57637 | default | t
2 | 2 | localhost | 57638 | default | f
nodeid | groupid | nodename | nodeport | noderack | hasmetadata | noderole
--------+---------+-----------+----------+----------+-------------+----------
1 | 1 | localhost | 57637 | default | t | p
2 | 2 | localhost | 57638 | default | f | p
(2 rows)
SELECT * FROM pg_dist_partition ORDER BY logicalrelid;
@ -333,10 +333,10 @@ SELECT * FROM pg_dist_local_group;
(1 row)
SELECT * FROM pg_dist_node ORDER BY nodeid;
nodeid | groupid | nodename | nodeport | noderack | hasmetadata
--------+---------+-----------+----------+----------+-------------
1 | 1 | localhost | 57637 | default | t
2 | 2 | localhost | 57638 | default | f
nodeid | groupid | nodename | nodeport | noderack | hasmetadata | noderole
--------+---------+-----------+----------+----------+-------------+----------
1 | 1 | localhost | 57637 | default | t | p
2 | 2 | localhost | 57638 | default | f | p
(2 rows)
SELECT * FROM pg_dist_partition ORDER BY logicalrelid;
@ -1134,8 +1134,8 @@ SELECT create_distributed_table('mx_table', 'a');
\c - postgres - :master_port
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
---------------------------------
(4,4,localhost,57638,default,f)
-----------------------------------
(4,4,localhost,57638,default,f,p)
(1 row)
SELECT start_metadata_sync_to_node('localhost', :worker_2_port);
@ -1318,8 +1318,8 @@ WHERE logicalrelid='mx_ref'::regclass;
SELECT master_add_node('localhost', :worker_2_port);
NOTICE: Replicating reference table "mx_ref" to all workers
master_add_node
---------------------------------
(5,5,localhost,57638,default,f)
-----------------------------------
(5,5,localhost,57638,default,f,p)
(1 row)
SELECT shardid, nodename, nodeport

View File

@ -44,8 +44,8 @@ SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
-- re-add the node for next tests
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
---------------------------------------------
(1380000,1380000,localhost,57638,default,f)
-----------------------------------------------
(1380000,1380000,localhost,57638,default,f,p)
(1 row)
-- remove a node with reference table
@ -166,8 +166,8 @@ ERROR: could not find valid entry for node "localhost:57638"
SELECT master_add_node('localhost', :worker_2_port);
NOTICE: Replicating reference table "remove_node_reference_table" to all workers
master_add_node
---------------------------------------------
(1380001,1380001,localhost,57638,default,f)
-----------------------------------------------
(1380001,1380001,localhost,57638,default,f,p)
(1 row)
-- remove node in a transaction and ROLLBACK
@ -389,8 +389,8 @@ WHERE
SELECT master_add_node('localhost', :worker_2_port);
NOTICE: Replicating reference table "remove_node_reference_table" to all workers
master_add_node
---------------------------------------------
(1380002,1380002,localhost,57638,default,f)
-----------------------------------------------
(1380002,1380002,localhost,57638,default,f,p)
(1 row)
-- test inserting a value then removing a node in a transaction
@ -518,8 +518,8 @@ SELECT * FROM remove_node_reference_table;
SELECT master_add_node('localhost', :worker_2_port);
NOTICE: Replicating reference table "remove_node_reference_table" to all workers
master_add_node
---------------------------------------------
(1380003,1380003,localhost,57638,default,f)
-----------------------------------------------
(1380003,1380003,localhost,57638,default,f,p)
(1 row)
-- test executing DDL command then removing a node in a transaction
@ -643,8 +643,8 @@ Table "public.remove_node_reference_table"
SELECT master_add_node('localhost', :worker_2_port);
NOTICE: Replicating reference table "remove_node_reference_table" to all workers
master_add_node
---------------------------------------------
(1380004,1380004,localhost,57638,default,f)
-----------------------------------------------
(1380004,1380004,localhost,57638,default,f,p)
(1 row)
-- test DROP table after removing a node in a transaction
@ -711,8 +711,8 @@ SELECT * FROM pg_dist_colocation WHERE colocationid = 1380000;
-- re-add the node for next tests
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
---------------------------------------------
(1380005,1380005,localhost,57638,default,f)
-----------------------------------------------
(1380005,1380005,localhost,57638,default,f,p)
(1 row)
-- re-create remove_node_reference_table
@ -846,8 +846,8 @@ SELECT master_add_node('localhost', :worker_2_port);
NOTICE: Replicating reference table "remove_node_reference_table" to all workers
NOTICE: Replicating reference table "table1" to all workers
master_add_node
---------------------------------------------
(1380006,1380006,localhost,57638,default,f)
-----------------------------------------------
(1380006,1380006,localhost,57638,default,f,p)
(1 row)
-- test with master_disable_node
@ -963,8 +963,8 @@ SELECT master_add_node('localhost', :worker_2_port);
NOTICE: Replicating reference table "remove_node_reference_table" to all workers
NOTICE: Replicating reference table "table1" to all workers
master_add_node
---------------------------------------------
(1380007,1380007,localhost,57638,default,f)
-----------------------------------------------
(1380007,1380007,localhost,57638,default,f,p)
(1 row)
-- DROP tables to clean workspace

View File

@ -26,8 +26,8 @@ SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
---------------------------------------------
(1370000,1370000,localhost,57638,default,f)
-----------------------------------------------
(1370000,1370000,localhost,57638,default,f,p)
(1 row)
-- verify node is added
@ -125,8 +125,8 @@ WHERE colocationid IN
SELECT master_add_node('localhost', :worker_2_port);
NOTICE: Replicating reference table "replicate_reference_table_valid" to all workers
master_add_node
---------------------------------------------
(1370002,1370002,localhost,57638,default,f)
-----------------------------------------------
(1370002,1370002,localhost,57638,default,f,p)
(1 row)
-- status after master_add_node
@ -178,8 +178,8 @@ WHERE colocationid IN
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
---------------------------------------------
(1370002,1370002,localhost,57638,default,f)
-----------------------------------------------
(1370002,1370002,localhost,57638,default,f,p)
(1 row)
-- status after master_add_node
@ -246,8 +246,8 @@ BEGIN;
SELECT master_add_node('localhost', :worker_2_port);
NOTICE: Replicating reference table "replicate_reference_table_rollback" to all workers
master_add_node
---------------------------------------------
(1370003,1370003,localhost,57638,default,f)
-----------------------------------------------
(1370003,1370003,localhost,57638,default,f,p)
(1 row)
ROLLBACK;
@ -308,8 +308,8 @@ BEGIN;
SELECT master_add_node('localhost', :worker_2_port);
NOTICE: Replicating reference table "replicate_reference_table_commit" to all workers
master_add_node
---------------------------------------------
(1370004,1370004,localhost,57638,default,f)
-----------------------------------------------
(1370004,1370004,localhost,57638,default,f,p)
(1 row)
COMMIT;
@ -403,8 +403,8 @@ BEGIN;
SELECT master_add_node('localhost', :worker_2_port);
NOTICE: Replicating reference table "replicate_reference_table_reference_one" to all workers
master_add_node
---------------------------------------------
(1370005,1370005,localhost,57638,default,f)
-----------------------------------------------
(1370005,1370005,localhost,57638,default,f,p)
(1 row)
SELECT upgrade_to_reference_table('replicate_reference_table_hash');
@ -552,8 +552,8 @@ BEGIN;
SELECT master_add_node('localhost', :worker_2_port);
NOTICE: Replicating reference table "replicate_reference_table_drop" to all workers
master_add_node
---------------------------------------------
(1370009,1370009,localhost,57638,default,f)
-----------------------------------------------
(1370009,1370009,localhost,57638,default,f,p)
(1 row)
DROP TABLE replicate_reference_table_drop;
@ -614,8 +614,8 @@ WHERE colocationid IN
SELECT master_add_node('localhost', :worker_2_port);
NOTICE: Replicating reference table "table1" to all workers
master_add_node
---------------------------------------------
(1370010,1370010,localhost,57638,default,f)
-----------------------------------------------
(1370010,1370010,localhost,57638,default,f,p)
(1 row)
-- status after master_add_node

View File

@ -79,14 +79,14 @@ CREATE EXTENSION citus;
-- re-add the nodes to the cluster
SELECT master_add_node('localhost', :worker_1_port);
master_add_node
---------------------------------
(1,1,localhost,57637,default,f)
-----------------------------------
(1,1,localhost,57637,default,f,p)
(1 row)
SELECT master_add_node('localhost', :worker_2_port);
master_add_node
---------------------------------
(2,2,localhost,57638,default,f)
-----------------------------------
(2,2,localhost,57638,default,f,p)
(1 row)
-- create a table with a SERIAL column

View File

@ -217,16 +217,16 @@ SELECT master_add_node('localhost', 5432);
ERROR: operation is not allowed on this node
HINT: Connect to the coordinator and run it again.
SELECT * FROM pg_dist_node WHERE nodename='localhost' AND nodeport=5432;
nodeid | groupid | nodename | nodeport | noderack | hasmetadata
--------+---------+----------+----------+----------+-------------
nodeid | groupid | nodename | nodeport | noderack | hasmetadata | noderole
--------+---------+----------+----------+----------+-------------+----------
(0 rows)
-- master_remove_node
\c - - - :master_port
SELECT master_add_node('localhost', 5432);
master_add_node
--------------------------------------------
(1370000,1370000,localhost,5432,default,f)
----------------------------------------------
(1370000,1370000,localhost,5432,default,f,p)
(1 row)
\c - - - :worker_1_port
@ -234,9 +234,9 @@ SELECT master_remove_node('localhost', 5432);
ERROR: operation is not allowed on this node
HINT: Connect to the coordinator and run it again.
SELECT * FROM pg_dist_node WHERE nodename='localhost' AND nodeport=5432;
nodeid | groupid | nodename | nodeport | noderack | hasmetadata
---------+---------+-----------+----------+----------+-------------
1370000 | 1370000 | localhost | 5432 | default | f
nodeid | groupid | nodename | nodeport | noderack | hasmetadata | noderole
---------+---------+-----------+----------+----------+-------------+----------
1370000 | 1370000 | localhost | 5432 | default | f | p
(1 row)
\c - - - :master_port

View File

@ -770,8 +770,8 @@ SELECT master_add_node('localhost', :worker_1_port);
NOTICE: Replicating reference table "nation" to all workers
NOTICE: Replicating reference table "supplier" to all workers
master_add_node
---------------------------------
(3,3,localhost,57637,default,f)
-----------------------------------
(3,3,localhost,57637,default,f,p)
(1 row)
RESET citus.shard_replication_factor;

View File

@ -75,6 +75,7 @@ ALTER EXTENSION citus UPDATE TO '6.1-14';
ALTER EXTENSION citus UPDATE TO '6.1-15';
ALTER EXTENSION citus UPDATE TO '6.1-16';
ALTER EXTENSION citus UPDATE TO '6.1-17';
ALTER EXTENSION citus UPDATE TO '6.1-18';
-- ensure no objects were created outside pg_catalog
SELECT COUNT(*)