rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-17 02:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into thesuhas/remove_anon_extension

Browse Source
This commit is contained in:
Suhas Thalanki
2025-02-24 12:22:03 -05:00
committed by GitHub
parent b1ef701a06 40acb0c06d
commit dc75717bc0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pageserver/src/page_service.rs
View File

@@ -2097,9 +2097,8 @@ impl PageServerHandler {
set_tracing_field_shard_id(&timeline);
if timeline.is_archived() == Some(true) {
// TODO after a grace period, turn this log line into a hard error
tracing::warn!("timeline {tenant_id}/{timeline_id} is archived, but got basebackup request for it.");
//return Err(QueryError::NotFound("timeline is archived".into()))
tracing::info!("timeline {tenant_id}/{timeline_id} is archived, but got basebackup request for it.");
return Err(QueryError::NotFound("timeline is archived".into()));
}
let latest_gc_cutoff_lsn = timeline.get_applied_gc_cutoff_lsn();

9
pgxn/neon/libpagestore.c
View File

@@ -716,20 +716,21 @@ retry:
if (ret == 0)
{
WaitEvent event;
WaitEvent occurred_event;
int noccurred;
long timeout;
timeout = Max(0, LOG_INTERVAL_MS - INSTR_TIME_GET_MILLISEC(since_last_log));
/* Sleep until there's something to do */
(void) WaitEventSetWait(shard->wes_read, timeout, &event, 1,
WAIT_EVENT_NEON_PS_READ);
noccurred = WaitEventSetWait(shard->wes_read, timeout, &occurred_event, 1,
WAIT_EVENT_NEON_PS_READ);
ResetLatch(MyLatch);
CHECK_FOR_INTERRUPTS();
/* Data available in socket? */
if (event.events & WL_SOCKET_READABLE)
if (noccurred > 0 && (occurred_event.events & WL_SOCKET_READABLE) != 0)
{
if (!PQconsumeInput(pageserver_conn))
{