From 5d1eae732c148e755a7d403da277af2e68ccd400 Mon Sep 17 00:00:00 2001 From: Burak Velioglu Date: Mon, 17 Jan 2022 15:02:53 +0300 Subject: [PATCH] Update metadata sync function names --- .../distributed/metadata/metadata_sync.c | 44 +++++++++---------- src/backend/distributed/test/metadata_sync.c | 4 +- src/backend/distributed/utils/maintenanced.c | 2 +- src/include/distributed/metadata_sync.h | 8 ++-- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/backend/distributed/metadata/metadata_sync.c b/src/backend/distributed/metadata/metadata_sync.c index 97bf6e368..242ba7dd4 100644 --- a/src/backend/distributed/metadata/metadata_sync.c +++ b/src/backend/distributed/metadata/metadata_sync.c @@ -91,7 +91,7 @@ static char * SchemaOwnerName(Oid objectId); static bool HasMetadataWorkers(void); static bool ShouldSyncTableMetadataInternal(bool hashDistributed, bool citusTableWithNoDistKey); -static bool SyncMetadataSnapshotToNode(WorkerNode *workerNode, bool raiseOnError); +static bool SyncNodeMetadataSnapshotToNode(WorkerNode *workerNode, bool raiseOnError); static void DropMetadataSnapshotOnNode(WorkerNode *workerNode); static char * CreateSequenceDependencyCommand(Oid relationId, Oid sequenceId, char *columnName); @@ -235,7 +235,7 @@ SyncNodeMetadataToNode(const char *nodeNameString, int32 nodePort) /* fail if metadata synchronization doesn't succeed */ bool raiseInterrupts = true; - SyncMetadataSnapshotToNode(workerNode, raiseInterrupts); + SyncNodeMetadataSnapshotToNode(workerNode, raiseInterrupts); } @@ -442,25 +442,25 @@ ShouldSyncTableMetadataInternal(bool hashDistributed, bool citusTableWithNoDistK /* - * SyncMetadataSnapshotToNode does the following: + * SyncNodeMetadataSnapshotToNode does the following: * 1. Sets the localGroupId on the worker so the worker knows which tuple in * pg_dist_node represents itself. * 2. Recreates the distributed metadata on the given worker. * If raiseOnError is true, it errors out if synchronization fails. */ static bool -SyncMetadataSnapshotToNode(WorkerNode *workerNode, bool raiseOnError) +SyncNodeMetadataSnapshotToNode(WorkerNode *workerNode, bool raiseOnError) { char *currentUser = CurrentUserName(); /* generate and add the local group id's update query */ char *localGroupIdUpdateCommand = LocalGroupIdUpdateCommand(workerNode->groupId); - /* generate the queries which drop the metadata */ - List *dropMetadataCommandList = MetadataDropCommands(); + /* generate the queries which drop the node metadata */ + List *dropMetadataCommandList = NodeMetadataDropCommands(); - /* generate the queries which create the metadata from scratch */ - List *createMetadataCommandList = MetadataCreateCommands(); + /* generate the queries which create the node metadata from scratch */ + List *createMetadataCommandList = NodeMetadataCreateCommands(); List *recreateMetadataSnapshotCommandList = list_make1(localGroupIdUpdateCommand); recreateMetadataSnapshotCommandList = list_concat(recreateMetadataSnapshotCommandList, @@ -506,7 +506,7 @@ DropMetadataSnapshotOnNode(WorkerNode *workerNode) char *userName = CurrentUserName(); /* generate the queries which drop the metadata */ - List *dropMetadataCommandList = MetadataDropCommands(); + List *dropMetadataCommandList = NodeMetadataDropCommands(); dropMetadataCommandList = lappend(dropMetadataCommandList, LocalGroupIdUpdateCommand(0)); @@ -520,7 +520,7 @@ DropMetadataSnapshotOnNode(WorkerNode *workerNode) /* - * MetadataCreateCommands returns list of queries that are + * NodeMetadataCreateCommands returns list of queries that are * required to create the current metadata snapshot of the node that the * function is called. The metadata snapshot commands includes the * following queries: @@ -528,7 +528,7 @@ DropMetadataSnapshotOnNode(WorkerNode *workerNode) * (i) Query that populates pg_dist_node table */ List * -MetadataCreateCommands(void) +NodeMetadataCreateCommands(void) { List *metadataSnapshotCommandList = NIL; bool includeNodesFromOtherClusters = true; @@ -687,14 +687,14 @@ GetDistributedTableMetadataEvents(Oid relationId) /* - * MetadataDropCommands returns list of queries that are required to + * NodeMetadataDropCommands returns list of queries that are required to * drop all the metadata of the node that are not related to clustered tables. * The drop metadata snapshot commands includes the following queries: * * (i) Queries that delete all the rows from pg_dist_node table */ List * -MetadataDropCommands(void) +NodeMetadataDropCommands(void) { List *dropSnapshotCommandList = NIL; @@ -1971,7 +1971,7 @@ DetachPartitionCommandList(void) /* - * SyncMetadataToNodes tries recreating the metadata snapshot in the + * SyncNodeMetadataToNodes tries recreating the metadata snapshot in the * metadata workers that are out of sync. Returns the result of * synchronization. * @@ -1980,7 +1980,7 @@ DetachPartitionCommandList(void) * goes wrong. */ static MetadataSyncResult -SyncMetadataToNodes(void) +SyncNodeMetadataToNodes(void) { MetadataSyncResult result = METADATA_SYNC_SUCCESS; if (!IsCoordinator()) @@ -2006,7 +2006,7 @@ SyncMetadataToNodes(void) if (workerNode->hasMetadata && !workerNode->metadataSynced) { bool raiseInterrupts = false; - if (!SyncMetadataSnapshotToNode(workerNode, raiseInterrupts)) + if (!SyncNodeMetadataSnapshotToNode(workerNode, raiseInterrupts)) { ereport(WARNING, (errmsg("failed to sync metadata to %s:%d", workerNode->workerName, @@ -2041,11 +2041,11 @@ SyncMetadataToNodes(void) /* - * SyncMetadataToNodesMain is the main function for syncing metadata to + * SyncNodeMetadataToNodesMain is the main function for syncing node metadata to * MX nodes. It retries until success and then exits. */ void -SyncMetadataToNodesMain(Datum main_arg) +SyncNodeMetadataToNodesMain(Datum main_arg) { Oid databaseOid = DatumGetObjectId(main_arg); @@ -2086,7 +2086,7 @@ SyncMetadataToNodesMain(Datum main_arg) { UseCoordinatedTransaction(); - MetadataSyncResult result = SyncMetadataToNodes(); + MetadataSyncResult result = SyncNodeMetadataToNodes(); syncedAllNodes = (result == METADATA_SYNC_SUCCESS); /* we use LISTEN/NOTIFY to wait for metadata syncing in tests */ @@ -2174,11 +2174,11 @@ MetadataSyncSigAlrmHandler(SIGNAL_ARGS) /* - * SpawnSyncMetadataToNodes starts a background worker which runs metadata + * SpawnSyncNodeMetadataToNodes starts a background worker which runs node metadata * sync. On success it returns workers' handle. Otherwise it returns NULL. */ BackgroundWorkerHandle * -SpawnSyncMetadataToNodes(Oid database, Oid extensionOwner) +SpawnSyncNodeMetadataToNodes(Oid database, Oid extensionOwner) { BackgroundWorker worker; BackgroundWorkerHandle *handle = NULL; @@ -2196,7 +2196,7 @@ SpawnSyncMetadataToNodes(Oid database, Oid extensionOwner) worker.bgw_restart_time = BGW_NEVER_RESTART; strcpy_s(worker.bgw_library_name, sizeof(worker.bgw_library_name), "citus"); strcpy_s(worker.bgw_function_name, sizeof(worker.bgw_library_name), - "SyncMetadataToNodesMain"); + "SyncNodeMetadataToNodesMain"); worker.bgw_main_arg = ObjectIdGetDatum(MyDatabaseId); memcpy_s(worker.bgw_extra, sizeof(worker.bgw_extra), &extensionOwner, sizeof(Oid)); diff --git a/src/backend/distributed/test/metadata_sync.c b/src/backend/distributed/test/metadata_sync.c index 52bfa77cd..026dd1664 100644 --- a/src/backend/distributed/test/metadata_sync.c +++ b/src/backend/distributed/test/metadata_sync.c @@ -50,8 +50,8 @@ activate_node_snapshot(PG_FUNCTION_ARGS) List *recreateTablesCommands = RecreateDistributedTablesWithDependenciesCommandList( dummyWorkerNode); - List *dropSnapshotCommands = MetadataDropCommands(); - List *createSnapshotCommands = MetadataCreateCommands(); + List *dropSnapshotCommands = NodeMetadataDropCommands(); + List *createSnapshotCommands = NodeMetadataCreateCommands(); List *metadataUpdateCommandList = ResyncMetadataCommandList(); List *activateNodeCommandList = NIL; int activateNodeCommandIndex = 0; diff --git a/src/backend/distributed/utils/maintenanced.c b/src/backend/distributed/utils/maintenanced.c index 2295830d6..940764235 100644 --- a/src/backend/distributed/utils/maintenanced.c +++ b/src/backend/distributed/utils/maintenanced.c @@ -524,7 +524,7 @@ CitusMaintenanceDaemonMain(Datum main_arg) if (syncMetadata) { metadataSyncBgwHandle = - SpawnSyncMetadataToNodes(MyDatabaseId, myDbData->userOid); + SpawnSyncNodeMetadataToNodes(MyDatabaseId, myDbData->userOid); } nextMetadataSyncTime = diff --git a/src/include/distributed/metadata_sync.h b/src/include/distributed/metadata_sync.h index 7cfa268ba..598104f89 100644 --- a/src/include/distributed/metadata_sync.h +++ b/src/include/distributed/metadata_sync.h @@ -33,9 +33,9 @@ extern bool ClusterHasKnownMetadataWorkers(void); extern char * LocalGroupIdUpdateCommand(int32 groupId); extern bool ShouldSyncTableMetadata(Oid relationId); extern bool ShouldSyncTableMetadataViaCatalog(Oid relationId); -extern List * MetadataCreateCommands(void); +extern List * NodeMetadataCreateCommands(void); extern List * DistributedObjectMetadataSyncCommandList(void); -extern List * MetadataDropCommands(void); +extern List * NodeMetadataDropCommands(void); extern char * MarkObjectsDistributedCreateCommand(List *addresses, List *distributionArgumentIndexes, List *colocationIds); @@ -57,8 +57,8 @@ extern char * TruncateTriggerCreateCommand(Oid relationId); extern void CreateShellTableOnWorkers(Oid relationId); extern void CreateTableMetadataOnWorkers(Oid relationId); extern List * DetachPartitionCommandList(void); -extern BackgroundWorkerHandle * SpawnSyncMetadataToNodes(Oid database, Oid owner); -extern void SyncMetadataToNodesMain(Datum main_arg); +extern BackgroundWorkerHandle * SpawnSyncNodeMetadataToNodes(Oid database, Oid owner); +extern void SyncNodeMetadataToNodesMain(Datum main_arg); extern void SignalMetadataSyncDaemon(Oid database, int sig); extern bool ShouldInitiateMetadataSync(bool *lockFailure); extern List * SequenceDependencyCommandList(Oid relationId);