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

!2288 issue#I5UEWO Cleanup sessions for one database which is conflict with when recovery drop database

Browse Source 
Merge pull request !2288 from wangchunling/issue#I5UEWO
This commit is contained in:
opengauss-bot
2022-11-02 02:48:36 +00:00
committed by Gitee
parent 47541fce1f 028719bd3b
commit 4389fbcd4b
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gausskernel/storage/ipc/standby.cpp
View File

@ -34,6 +34,7 @@
#include "utils/ps_status.h"
#include "utils/timestamp.h"
#include "utils/snapmgr.h"
#include "pgxc/poolutils.h"
#include "replication/walreceiver.h"
static void ResolveRecoveryConflictWithVirtualXIDs(VirtualTransactionId* waitlist, TransactionId* xminArray,
ProcSignalReason reason);
@ -385,14 +386,21 @@ void ResolveRecoveryConflictWithDatabase(Oid dbid)
* block during InitPostgres() and then disconnect when they see the
* database has been removed.
*/
while (CountDBActiveBackends(dbid) > 0) {
CancelDBBackends(dbid, PROCSIG_RECOVERY_CONFLICT_DATABASE, true);
/*
* Wait awhile for them to die so that we avoid flooding an
* unresponsive backend when system is heavily loaded.
*/
pg_usleep(10000);
if (ENABLE_THREAD_POOL) {
ThreadPoolSessControl *sess_ctrl = g_threadPoolControler->GetSessionCtrl();
while (sess_ctrl->CountDBSessionsNotCleaned(dbid, InvalidOid) > 0) {
sess_ctrl->CleanDBSessions(dbid, InvalidOid);
pg_usleep(10000);
}
} else {
while (CountDBBackends(dbid) > 0) {
CancelDBBackends(dbid, PROCSIG_RECOVERY_CONFLICT_DATABASE, true);
/*
* Wait awhile for them to die so that we avoid flooding an
* unresponsive backend when system is heavily loaded.
*/
pg_usleep(10000);
}
}
}