rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2025-12-23 06:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for Pg16: (#5292)

Browse Source 
- pagestore_smgr.c had unnecessary WALSync() (see #5287 )
- Compute node dockerfile didn't build the neon_rmgr extension
- Add PostgreSQL 16 image to docker-compose tests
- Fix issue with high CPU usage in Safekeeper due to a bug in WALSender

Co-authored-by: Alexander Bayandin <alexander@neon.tech>
This commit is contained in:
MMeent
2023-09-12 21:02:03 +02:00
committed by GitHub
parent 2641ff3d1a
commit 3b6b847d76
4 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile.compute-node
View File

@@ -805,6 +805,20 @@ RUN make -j $(getconf _NPROCESSORS_ONLN) \
PG_CONFIG=/usr/local/pgsql/bin/pg_config \
-C pgxn/neon_utils \
-s install && \
make -j $(getconf _NPROCESSORS_ONLN) \
PG_CONFIG=/usr/local/pgsql/bin/pg_config \
-C pgxn/neon_rmgr \
-s install && \
case "${PG_VERSION}" in \
"v14" | "v15") \
;; \
"v16") \
echo "Skipping HNSW for PostgreSQL 16" && exit 0 \
;; \
*) \
echo "unexpected PostgreSQL version" && exit 1 \
;; \
esac && \
make -j $(getconf _NPROCESSORS_ONLN) \
PG_CONFIG=/usr/local/pgsql/bin/pg_config \
-C pgxn/hnsw \

2
docker-compose/docker_compose_test.sh
View File

@@ -30,7 +30,7 @@ cleanup() {
echo "clean up containers if exists"
cleanup
for pg_version in 14 15; do
for pg_version in 14 15 16; do
echo "start containers (pg_version=$pg_version)."
PG_VERSION=$pg_version docker compose -f $COMPOSE_FILE up --build -d

5
pgxn/neon/pagestore_smgr.c
View File

@@ -504,11 +504,6 @@ prefetch_wait_for(uint64 ring_index)
{
entry = GetPrfSlot(MyPState->ring_receive);
#if PG_MAJORVERSION_NUM >= 16
/* ensure the log is actually flushed up to the request point */
XLogFlush(entry->actual_request_lsn);
#endif
Assert(entry->status == PRFS_REQUESTED);
if (!prefetch_read(entry))
return false;

84
pgxn/neon/walproposer.c
View File

@@ -386,10 +386,13 @@ WalProposerPoll(void)
{
while (true)
{
Safekeeper *sk;
bool wait_timeout;
WaitEvent event;
Safekeeper *sk = NULL;
bool wait_timeout = false;
bool late_cv_trigger = false;
WaitEvent event = {0};
int rc = 0;
TimestampTz now = GetCurrentTimestamp();
long timeout = TimeToReconnect(now);
#if PG_MAJORVERSION_NUM >= 16
if (WalSndCtl != NULL)
@@ -403,51 +406,44 @@ WalProposerPoll(void)
* * PG15-: We got woken up by a process triggering the WalSender
* * PG16+: WalSndCtl->wal_flush_cv was triggered
*/
if (WaitEventSetWait(waitEvents, TimeToReconnect(now),
&event, 1, WAIT_EVENT_WAL_SENDER_MAIN) == 1)
{
/*
* If wait is terminated by latch set (walsenders' latch is set on
* each wal flush), then exit loop. (no need for pm death check due to
* WL_EXIT_ON_PM_DEATH)
*/
if (event.events & WL_LATCH_SET)
{
/* Reset our latch */
ResetLatch(MyLatch);
rc = WaitEventSetWait(waitEvents, timeout,
&event, 1, WAIT_EVENT_WAL_SENDER_MAIN);
#if PG_MAJORVERSION_NUM >= 16
if (WalSndCtl != NULL)
ConditionVariableCancelSleep();
if (WalSndCtl != NULL)
late_cv_trigger = ConditionVariableCancelSleep();
#endif
break;
}
/*
* If the event contains something that one of our safekeeper states
* was waiting for, we'll advance its state.
*/
if (event.events & (WL_SOCKET_MASK))
{
sk = (Safekeeper *) event.user_data;
AdvancePollState(sk, event.events);
}
else
pg_unreachable();
/*
* If wait is terminated by latch set (walsenders' latch is set on
* each wal flush), then exit loop. (no need for pm death check due to
* WL_EXIT_ON_PM_DEATH)
*/
if ((rc == 1 && event.events & WL_LATCH_SET) || late_cv_trigger)
{
/* Reset our latch */
ResetLatch(MyLatch);
break;
}
else /* timeout expired */
/*
* If the event contains something that one of our safekeeper states
* was waiting for, we'll advance its state.
*/
if (rc == 1 && (event.events & (WL_SOCKET_MASK)))
{
#if PG_MAJORVERSION_NUM >= 16
/* First, cancel sleep - we might do some complex stuff after this */
if (WalSndCtl != NULL)
ConditionVariableCancelSleep();
#endif
sk = (Safekeeper *) event.user_data;
AdvancePollState(sk, event.events);
}
/*
* If the timeout expired, attempt to reconnect to any safekeepers
* that we dropped
*/
ReconnectSafekeepers();
/*
* If the timeout expired, attempt to reconnect to any safekeepers
* that we dropped
*/
ReconnectSafekeepers();
if (rc == 0) /* timeout expired */
{
wait_timeout = true;
/*
@@ -463,13 +459,13 @@ WalProposerPoll(void)
#else
flushed = GetFlushRecPtr(NULL);
#endif
if (flushed != availableLsn)
if (flushed > availableLsn)
break;
}
}
now = GetCurrentTimestamp();
if (wait_timeout || TimeToReconnect(now) <= 0) /* timeout expired: poll state */
if (rc == 0 || TimeToReconnect(now) <= 0) /* timeout expired: poll state */
{
TimestampTz now;