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

!2643 【共享存储】【bugfix】修复CBConfirmCoverting出现core

Browse Source 
Merge pull request !2643 from 董宁/master
This commit is contained in:
opengauss-bot
2022-12-19 12:20:26 +00:00
committed by Gitee
parent f6cd9da230 2f9e6e1fe4
commit d8efa2c50f
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gausskernel/ddes/adapter/ss_dms_callback.cpp
View File

@ -1065,7 +1065,6 @@ static void SSGetBufferDesc(char *pageid, bool *is_valid, BufferDesc** ret_buf_d
{
(void)LWLockAcquire(partition_lock, LW_SHARED);
buf_id = BufTableLookup(tag, hash);
Assert(buf_id >= 0);
if (buf_id >= 0) {
buf_desc = GetBufferDescriptor(buf_id);
ResourceOwnerEnlargeBuffers(t_thrd.utils_cxt.CurrentResourceOwner);
@ -1118,7 +1117,7 @@ static int CBConfirmOwner(void *db_handle, char *pageid, unsigned char *lock_mod
}
/*
* not acquire buf_desc->content_lock
* not acquire buf_desc->io_in_progress_lock
* consistency guaranteed by reform phase
*/
buf_ctrl = GetDmsBufCtrl(buf_desc->buf_id);
@ -1156,23 +1155,23 @@ static int CBConfirmConverting(void *db_handle, char *pageid, unsigned char smon
struct timeval begin_tv;
struct timeval now_tv;
(void)gettimeofday(&begin_tv, NULL);
long begin = GET_MS(begin_tv);
long begin = GET_US(begin_tv);
long now;
while (true) {
(void)gettimeofday(&now_tv, NULL);
now = GET_MS(now_tv);
if (now - begin > REFORM_CONFIRM_TIMEOUT) {
timeout = true;
break;
}
bool is_locked = LWLockConditionalAcquire(buf_desc->content_lock, LW_EXCLUSIVE);
bool is_locked = LWLockConditionalAcquire(buf_desc->io_in_progress_lock, LW_EXCLUSIVE);
if (is_locked) {
buf_ctrl = GetDmsBufCtrl(buf_desc->buf_id);
*ver = buf_ctrl->ver;
*lock_mode = buf_ctrl->lock_mode;
LWLockRelease(buf_desc->content_lock);
LWLockRelease(buf_desc->io_in_progress_lock);
break;
}
(void)gettimeofday(&now_tv, NULL);
now = GET_US(now_tv);
if (now - begin > REFORM_CONFIRM_TIMEOUT) {
timeout = true;
break;
}
pg_usleep(REFORM_CONFIRM_INTERVAL); /* sleep 5ms */

2
src/include/ddes/dms/ss_dms_callback.h
View File

@ -28,7 +28,7 @@
/* 5 seconds */
#define REFORM_CONFIRM_TIMEOUT 5000000
#define REFORM_CONFIRM_INTERVAL 5000
#define GET_MS(tv) (tv.tv_sec * 1000000 + tv.tv_usec)
#define GET_US(tv) ((int64)tv.tv_sec * 1000000U + tv.tv_usec)
#define DMS_LOGGER_BUFFER_SIZE 2048
extern void DmsInitCallback(dms_callback_t *callback);