diff --git a/src/gausskernel/process/postmaster/pgarch.cpp b/src/gausskernel/process/postmaster/pgarch.cpp index 40a6df836..69e999bab 100644 --- a/src/gausskernel/process/postmaster/pgarch.cpp +++ b/src/gausskernel/process/postmaster/pgarch.cpp @@ -698,7 +698,7 @@ static inline void pgarch_UpdateArchiveLastLsn(XLogRecPtr targetLsn) t_thrd.arch.last_arch_time = TIME_GET_MILLISEC(tv); t_thrd.arch.pitr_task_last_lsn = targetLsn; g_instance.archive_obs_cxt.pitr_task_last_lsn = t_thrd.arch.pitr_task_last_lsn; - g_instance.archive_obs_cxt.last_arch_time = t_thrd.arch.last_arch_time; + g_instance.archive_obs_cxt.last_arch_timestamp = GetCurrentTimestamp(); } /* @@ -1291,7 +1291,7 @@ Datum gs_get_archive_status(PG_FUNCTION_ARGS) int ret = 0; Datum values[ARCHIVE_STATUS_COLS]; XLogRecPtr last_arch_lsn = g_instance.archive_obs_cxt.pitr_task_last_lsn; - long last_arch_time = g_instance.archive_obs_cxt.last_arch_time; + long last_arch_time = g_instance.archive_obs_cxt.last_arch_timestamp; /* get the ip address of standby */ char remoteip[IP_LEN] = {0}; errno_t rc = strncpy_s(remoteip, IP_LEN, (char *)walsnd->wal_sender_channel.remotehost, IP_LEN - 1); diff --git a/src/gausskernel/process/threadpool/knl_instance.cpp b/src/gausskernel/process/threadpool/knl_instance.cpp index c09bc2556..141d8208a 100644 --- a/src/gausskernel/process/threadpool/knl_instance.cpp +++ b/src/gausskernel/process/threadpool/knl_instance.cpp @@ -489,7 +489,7 @@ static void knl_g_archive_obs_init(knl_g_archive_obs_context *archive_obs_cxt) archive_obs_cxt->archive_slot = (ReplicationSlot*)MemoryContextAllocZero( INSTANCE_GET_MEM_CXT_GROUP(MEMORY_CONTEXT_STORAGE), sizeof(ReplicationSlot)); archive_obs_cxt->sync_walsender_idx = -1; - archive_obs_cxt->last_arch_time = 0; + archive_obs_cxt->last_arch_timestamp = 0; archive_obs_cxt->pitr_task_last_lsn = InvalidXLogRecPtr; } diff --git a/src/include/knl/knl_instance.h b/src/include/knl/knl_instance.h index 4dc228ee2..6ac0dd8a8 100644 --- a/src/include/knl/knl_instance.h +++ b/src/include/knl/knl_instance.h @@ -738,7 +738,7 @@ typedef struct knl_g_archive_obs_context { /* used to show the archive status */ volatile int sync_walsender_idx; - volatile long last_arch_time; + volatile long last_arch_timestamp; volatile XLogRecPtr pitr_task_last_lsn; /*