hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!1899 修复发布订阅若干问题

Browse Source 
Merge pull request !1899 from chenxiaobin/initial_data
This commit is contained in:
opengauss-bot
2022-06-29 02:31:50 +00:00
committed by Gitee
parent b020f439d6 32e0667943
commit efa8450158
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gausskernel/optimizer/commands/subscriptioncmds.cpp
View File

@ -181,6 +181,11 @@ static void parse_subscription_options(const List *options, char **conninfo, Lis
errmsg("subscription with slot_name = NONE must also set enabled = false"))); errmsg("subscription with slot_name = NONE must also set enabled = false")));
} }
} }
if (copy_data && *copy_data && u_sess->attr.attr_storage.max_sync_workers_per_subscription == 0) {
ereport(WARNING, (errmsg("you need to set max_sync_workers_per_subscription because it is zero but "
"copy_data is true")));
}
} }
/* /*
@ -859,6 +864,8 @@ ObjectAddress AlterSubscription(AlterSubscriptionStmt *stmt, bool isTopLevel)
if (publications != NIL) { if (publications != NIL) {
values[Anum_pg_subscription_subpublications - 1] = publicationListToArray(publications); values[Anum_pg_subscription_subpublications - 1] = publicationListToArray(publications);
replaces[Anum_pg_subscription_subpublications - 1] = true; replaces[Anum_pg_subscription_subpublications - 1] = true;
} else {
publications = sub->publications;
} }
tup = heap_modify_tuple(tup, RelationGetDescr(rel), values, nulls, replaces); tup = heap_modify_tuple(tup, RelationGetDescr(rel), values, nulls, replaces);

2
src/gausskernel/storage/replication/logical/tablesync.cpp
View File

@ -866,7 +866,9 @@ char *LogicalRepSyncTableStart(XLogRecPtr *origin_startpos)
* breakdown then it wouldn't have succeeded so trying it next time * breakdown then it wouldn't have succeeded so trying it next time
* seems like a better bet. * seems like a better bet.
*/ */
StartTransactionCommand();
ReplicationSlotDropAtPubNode(slotname, true); ReplicationSlotDropAtPubNode(slotname, true);
CommitTransactionCommand();
} else if (t_thrd.applyworker_cxt.curWorker->relstate == SUBREL_STATE_FINISHEDCOPY) { } else if (t_thrd.applyworker_cxt.curWorker->relstate == SUBREL_STATE_FINISHEDCOPY) {
/* /*
* The COPY phase was previously done, but tablesync then crashed * The COPY phase was previously done, but tablesync then crashed