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

fix stop failed when changing system time

Browse Source
This commit is contained in:
chenxiaobin
2021-03-18 20:50:42 +08:00
parent 2ce7a78523
commit 9226e96c9d
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/backend/port/unix_latch.cpp
View File

@ -423,6 +423,8 @@ int WaitLatchOrSocket(volatile Latch* latch, int wakeEvents, pgsocket sock, long
cur_timeout = timeout - (long)INSTR_TIME_GET_MILLISEC(cur_time);
if (cur_timeout < 0) {
cur_timeout = 0;
} else if (cur_timeout > timeout) {
cur_timeout = timeout;
}
#ifndef HAVE_POLL

2
src/gausskernel/process/postmaster/walwriterauxiliary.cpp
View File

@ -238,7 +238,7 @@ void WalWriterAuxiliaryMain(void)
}
}
rc = WaitLatch(&t_thrd.proc->procLatch, WL_TIMEOUT | WL_POSTMASTER_DEATH, cur_timeout);
rc = WaitLatch(&t_thrd.proc->procLatch, WL_LATCH_SET | WL_TIMEOUT | WL_POSTMASTER_DEATH, cur_timeout);
if (rc & WL_POSTMASTER_DEATH) {
gs_thread_exit(1);

3
src/gausskernel/storage/replication/heartbeat.cpp
View File

@ -174,11 +174,12 @@ static void delay_control(TimestampTz last_send_time)
TimestampTz now = GetCurrentTimestamp();
TimestampTz timeout = TimestampTzPlusMilliseconds(last_send_time, u_sess->attr.attr_common.dn_heartbeat_interval);
TimestampDifference(now, timeout, &secs, &microsecs);
Assert(secs <= u_sess->attr.attr_common.dn_heartbeat_interval);
/* If has exceeded send_interval, don't delay. */
if (secs == 0 && microsecs == 0) {
return;
} else if (secs > u_sess->attr.attr_common.dn_heartbeat_interval) {
secs = u_sess->attr.attr_common.dn_heartbeat_interval;
}
pg_usleep(secs * USECS_PER_SEC + microsecs);