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

!1982 修复 issue#I5AZHL There is 1 other session using the database when drop database

Browse Source 
Merge pull request !1982 from chardo/master
This commit is contained in:
opengauss-bot
2022-09-13 12:22:17 +00:00
committed by Gitee
parent 3a82659c71 94fc1b50a1
commit 1087ca712a
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/backend/utils/init/postinit.cpp
View File

@ -2532,10 +2532,11 @@ void PostgresInitializer::SetDatabaseByName()
ereport(FATAL, (errcode(ERRCODE_UNDEFINED_DATABASE), errmsg("database \"%s\" does not exist", m_indbname)));
}
dbform = (Form_pg_database)GETSTRUCT(tuple);
u_sess->proc_cxt.MyDatabaseId = HeapTupleGetOid(tuple);
// Do not set u_sess->proc_cxt.MyDatabaseId before LockDatabase.
// Other processes will assume that the session is connected to this database.
m_dboid = HeapTupleGetOid(tuple);
u_sess->proc_cxt.MyDatabaseTableSpace = dbform->dattablespace;
/* take database name from the caller, just for paranoia */
m_dboid = u_sess->proc_cxt.MyDatabaseId;
strlcpy(m_dbname, m_indbname, sizeof(m_dbname));
if (EnableLocalSysCache()) {
t_thrd.lsc_cxt.lsc->InitSessionDatabase(m_dboid, m_dbname, dbform->dattablespace);
@ -2560,9 +2561,9 @@ void PostgresInitializer::SetDatabaseByOid()
ereport(FATAL, (errcode(ERRCODE_UNDEFINED_DATABASE), errmsg("database %u does not exist", m_dboid)));
}
dbform = (Form_pg_database)GETSTRUCT(tuple);
u_sess->proc_cxt.MyDatabaseId = HeapTupleGetOid(tuple);
// Do not set u_sess->proc_cxt.MyDatabaseId before LockDatabase.
// Other processes will assume that the session is connected to this database.
u_sess->proc_cxt.MyDatabaseTableSpace = dbform->dattablespace;
Assert(u_sess->proc_cxt.MyDatabaseId == m_dboid);
strlcpy(m_dbname, NameStr(dbform->datname), sizeof(m_dbname));
if (EnableLocalSysCache()) {
t_thrd.lsc_cxt.lsc->InitSessionDatabase(m_dboid, m_dbname, dbform->dattablespace);
@ -2593,7 +2594,9 @@ void PostgresInitializer::LockDatabase()
* CREATE DATABASE.
*/
LockSharedObject(DatabaseRelationId, u_sess->proc_cxt.MyDatabaseId, 0, RowExclusiveLock);
LockSharedObject(DatabaseRelationId, m_dboid, 0, RowExclusiveLock);
// Set u_sess->proc_cxt.MyDatabaseId here. It's safe.
u_sess->proc_cxt.MyDatabaseId = m_dboid;
/*
* Now we can mark our PGPROC entry with the database ID.
*