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

Add log for checkpoint.

Browse Source
This commit is contained in:
TotaJ
2020-12-30 14:14:14 +08:00
committed by zhaowenhao
parent 96c73e99d8
commit 99a9dcbaf8
3 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gausskernel/process/postmaster/checkpointer.cpp
View File

@ -581,6 +581,9 @@ void CheckpointerMain(void)
*/
now = (pg_time_t)time(NULL);
elapsed_secs = now - t_thrd.checkpoint_cxt.last_checkpoint_time;
if (elapsed_secs < 0) {
elapsed_secs = 0;
}
if (elapsed_secs >= u_sess->attr.attr_storage.CheckPointTimeout)
continue; /* no sleep for us ... */

5
src/gausskernel/process/postmaster/pgarch.cpp
View File

@ -430,7 +430,10 @@ static void pgarch_MainLoop(void)
last_time = TIME_GET_MILLISEC(last_copy_time);
}
gettimeofday(&curtime, NULL);
const long time_diff = (long)TIME_GET_MILLISEC(curtime) - t_thrd.arch.last_arch_time;
long time_diff = (long)TIME_GET_MILLISEC(curtime) - t_thrd.arch.last_arch_time;
if (time_diff < 0) {
time_diff = 0;
}
long timeout = wait_interval - time_diff;
if (timeout < 0 && IsServerModeStandby()) {
/* sleep 100ms for check next task */

30
src/gausskernel/storage/buffer/bufmgr.cpp
View File

@ -84,6 +84,8 @@ const int ONE_MILLISECOND = 1;
const int TEN_MICROSECOND = 10;
const int MILLISECOND_TO_MICROSECOND = 1000;
const float PAGE_QUEUE_SLOT_USED_MAX_PERCENTAGE = 0.8;
const long CHKPT_LOG_TIME_INTERVAL = 1000000 * 60; /* 60000000us -> 1min */
const double CHKPT_LOG_PERCENT_INTERVAL = 0.1;
/*
* Status of buffers to checkpoint for a particular tablespace, used
@ -3019,6 +3021,7 @@ static void BufferSync(int flags)
int num_spaces;
int num_processed;
int num_written;
double bufferFlushPercent = CHKPT_LOG_PERCENT_INTERVAL;
CkptTsStatus *per_ts_stat = NULL;
Oid last_tsid;
binaryheap *ts_heap = NULL;
@ -3229,10 +3232,17 @@ static void BufferSync(int flags)
binaryheap_replace_first(ts_heap, PointerGetDatum(ts_stat));
}
double progress = (double)num_processed / num_to_scan;
/*
* Sleep to throttle our I/O rate.
*/
CheckpointWriteDelay(flags, (double)num_processed / num_to_scan);
CheckpointWriteDelay(flags, progress);
if (((uint32)flags & CHECKPOINT_IS_SHUTDOWN) && progress >= bufferFlushPercent && !IsInitdb) {
/* print warning log and increase counter if flushed percent exceed threshold */
ereport(WARNING, (errmsg("full checkpoint mode, shuting down, wait for dirty page flush, remain num:%d",
num_to_scan - num_processed)));
bufferFlushPercent += CHKPT_LOG_PERCENT_INTERVAL;
}
}
/* issue all pending flushes */
@ -3875,6 +3885,7 @@ void CheckPointBuffers(int flags, bool doFullCheckpoint)
pg_atomic_read_u32(&g_instance.ckpt_cxt_ctl->current_page_writer_count) < 1) {
BufferSync(flags);
} else if (g_instance.attr.attr_storage.enableIncrementalCheckpoint && doFullCheckpoint) {
long waitCount = 0;
/*
* If the enable_incremental_checkpoint is on, but doFullCheckpoint is true (full checkpoint),
* checkpoint thread don't need flush dirty page, but need wait pagewriter thread flush given
@ -3887,11 +3898,26 @@ void CheckPointBuffers(int flags, bool doFullCheckpoint)
break;
} else {
/* sleep 1 ms wait the dirty page flush */
pg_usleep(ONE_MILLISECOND * MILLISECOND_TO_MICROSECOND);
long sleepTime = ONE_MILLISECOND * MILLISECOND_TO_MICROSECOND;
pg_usleep(sleepTime);
/* do smgrsync in case dw file recycle of pagewriter is being blocked */
if (dw_enabled()) {
smgrsync_with_absorption();
}
if (((uint32)flags & CHECKPOINT_IS_SHUTDOWN) && !IsInitdb) {
/*
* since we use sleep time as counter so there will be some error in calculate the interval,
* but it doesn't mater cause we don't need a precise counter.
*/
waitCount += sleepTime;
if (waitCount >= CHKPT_LOG_TIME_INTERVAL) {
/* print warning log and reset counter if waitting time exceed threshold */
ereport(WARNING, (errmsg("incremental checkpoint mode, shuting down, "
"wait for dirty page flush, remain num:%u",
g_instance.ckpt_cxt_ctl->actual_dirty_page_num)));
waitCount = 0;
}
}
}
}
}