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

update src/gausskernel/storage/replication/slot.cpp.

Browse Source 
修复删除逻辑复制槽时，备机挂掉问题
This commit is contained in:
maxiang
2021-03-30 22:16:00 +08:00
committed by Gitee
parent 957d225d53
commit 207945f2dd
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gausskernel/storage/replication/slot.cpp
View File

@ -386,7 +386,7 @@ void ReplicationSlotCreate(const char *name, ReplicationSlotPersistency persiste
/* /*
* Find a previously created slot and mark it as used by this backend. * Find a previously created slot and mark it as used by this backend.
*/ */
void ReplicationSlotAcquire(const char *name, bool isDummyStandby) void ReplicationSlotAcquire(const char *name, bool isDummyStandby, bool isDrop)
{ {
ReplicationSlot *slot = NULL; ReplicationSlot *slot = NULL;
int i; int i;
@ -417,8 +417,13 @@ void ReplicationSlotAcquire(const char *name, bool isDummyStandby)
/* If we did not find the slot or it was already active, error out. */ /* If we did not find the slot or it was already active, error out. */
if (slot == NULL) if (slot == NULL)
ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("replication slot \"%s\" does not exist", name))); ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("replication slot \"%s\" does not exist", name)));
/* We allow dropping active logical replication slots on standby in opengauss. */
if (active) { if (active) {
if (slot->data.database != InvalidOid || isDummyStandby != slot->data.isDummyStandby) if ((slot->data.database != InvalidOid || isDummyStandby != slot->data.isDummyStandby)
ifndef ENABLE_MULTIPLE_NODES
&& !isDrop
#endif
)
ereport(ERROR, (errcode(ERRCODE_OBJECT_IN_USE), errmsg("replication slot \"%s\" is already active", name))); ereport(ERROR, (errcode(ERRCODE_OBJECT_IN_USE), errmsg("replication slot \"%s\" is already active", name)));
else { else {
ereport(WARNING, ereport(WARNING,
@ -546,7 +551,8 @@ void ReplicationSlotDrop(const char *name, bool for_backup)
*/ */
Assert(t_thrd.slot_cxt.MyReplicationSlot == NULL); Assert(t_thrd.slot_cxt.MyReplicationSlot == NULL);
ReplicationSlotAcquire(name, false); /* We allow dropping active logical replication slots on standby in opengauss. */
ReplicationSlotAcquire(name, false, RecoveryInProgress());
if (t_thrd.slot_cxt.MyReplicationSlot->archive_obs != NULL) { if (t_thrd.slot_cxt.MyReplicationSlot->archive_obs != NULL) {
markObsSlotOperate(0); markObsSlotOperate(0);
} }