test/he3pg
1
0
Fork 0
mirror of https://gitee.com/he3db/he3pg.git synced 2024-11-30 03:07:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve: push standby wait slave

Browse Source
This commit is contained in:
shenzhengntu 2023-06-14 06:47:25 +00:00 committed by wangyao
parent dd5777cfc1
commit 77ca8b0aa9
4 changed files with 56 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/backend/access/transam/pushpage.c
View File

@ -179,24 +179,29 @@ XLogRecPtr QueryMinLsn(XLogRecPtr lsn)
} }
initStringInfo(&cmd); initStringInfo(&cmd);
appendStringInfoString(&cmd, "SELECT t.application_name, t.replay_lsn, t.state, t.sync_state FROM pg_catalog.pg_stat_replication t WHERE t.application_name <> \'"); appendStringInfoString(&cmd, "SELECT t.application_name, t.replay_lsn, t.state, t.sync_state FROM pg_catalog.pg_stat_replication t WHERE t.application_name not like \'");
appendStringInfoString(&cmd, "pushstandby"); appendStringInfoString(&cmd, "push%");
appendStringInfoString(&cmd, "\' order by t.replay_lsn limit 1"); appendStringInfoString(&cmd, "\' and t.application_name not like \'priv%\' order by t.replay_lsn limit 1");
pgres = PQexec(pushconn, cmd.data); pgres = PQexec(pushconn, cmd.data);
if (PQresultStatus(pgres) == PGRES_TUPLES_OK && PQntuples(pgres) == 1) { if (PQresultStatus(pgres) == PGRES_TUPLES_OK) {
replyptr = PQgetvalue(pgres, 0, 1); if (PQntuples(pgres) == 1) {
bool flag; replyptr = PQgetvalue(pgres, 0, 1);
replylsn = pg_lsn_in_internal(replyptr,&flag); bool flag;
replylsn = pg_lsn_in_internal(replyptr,&flag);
if (replylsn == InvalidXLogRecPtr) {
elog(ERROR,"query pg_stat_replication replylsn failed");
PQclear(pgres);
return 1;
}
}
} }
else if (PQresultStatus(pgres) == PGRES_BAD_RESPONSE || else if (PQresultStatus(pgres) != PGRES_COMMAND_OK)
PQresultStatus(pgres) == PGRES_NONFATAL_ERROR ||
PQresultStatus(pgres) == PGRES_FATAL_ERROR)
{ {
PQfinish(pushconn); PQfinish(pushconn);
pushconn = NULL; pushconn = NULL;
PQclear(pgres); PQclear(pgres);
return InvalidXLogRecPtr; return 1;
} }
//elog(LOG,"appnamelsn: %x: replylsn %x",lsn,replylsn); //elog(LOG,"appnamelsn: %x: replylsn %x",lsn,replylsn);
if ((lsn !=InvalidXLogRecPtr && lsn < replylsn)||(replylsn == InvalidXLogRecPtr)) { if ((lsn !=InvalidXLogRecPtr && lsn < replylsn)||(replylsn == InvalidXLogRecPtr)) {

2
src/backend/access/transam/xlog.c
View File

@ -11405,7 +11405,7 @@ CheckPointGuts(XLogRecPtr checkPointRedo, int flags)
CheckPointMultiXact(); CheckPointMultiXact();
CheckPointPredicate(); CheckPointPredicate();
//only CHECKPOINT_IS_SHUTDOWN flush page,master only bufferpool full need to evict page //only CHECKPOINT_IS_SHUTDOWN flush page,master only bufferpool full need to evict page
if ((flags & (CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_END_OF_RECOVERY))|| if ((flags & CHECKPOINT_IS_SHUTDOWN) ||
IsBootstrapProcessingMode() == true || InitdbSingle == true) IsBootstrapProcessingMode() == true || InitdbSingle == true)
{ {
CheckPointBuffers(flags); CheckPointBuffers(flags);

42
src/backend/access/transam/xlogreader.c
View File

@ -752,7 +752,7 @@ restart:
#ifndef PG_NOREPLAY #ifndef PG_NOREPLAY
if (IsBootstrapProcessingMode() != true && InitdbSingle!=true) { if (IsBootstrapProcessingMode() != true && InitdbSingle!=true) {
if (getpid() == startupPid) { if (getpid() == startupPid) {
if (push_standby == true || EnableHotStandby == false || *isPromoteIsTriggered) { if (push_standby == true) {
/* Update shared-memory status */ /* Update shared-memory status */
XLogRecPtr prevPushPoint = PrePushPtr; XLogRecPtr prevPushPoint = PrePushPtr;
if (!XLogRecPtrIsInvalid(CheckPointPtr)) { if (!XLogRecPtrIsInvalid(CheckPointPtr)) {
@ -762,8 +762,23 @@ restart:
printf("curlsn==%x==prevPushPoint==%x==PushPoint==%x==last check point lsn====%x\n",RecPtr,prevPushPoint,PushPtr,CheckPointPtr); printf("curlsn==%x==prevPushPoint==%x==PushPoint==%x==last check point lsn====%x\n",RecPtr,prevPushPoint,PushPtr,CheckPointPtr);
CheckPointPtr = InvalidXLogRecPtr; CheckPointPtr = InvalidXLogRecPtr;
} }
if (ApplyLsn != InvalidXLogRecPtr && RecPtr >= ApplyLsn) { //need to tell push standby has new standby add
ApplyLsn = InvalidXLogRecPtr; while(ApplyLsn != InvalidXLogRecPtr && RecPtr >= ApplyLsn) {
XLogRecPtr tmpLsn = InvalidXLogRecPtr;
if (!he3mirror) {
tmpLsn = QueryMinLsn(InvalidXLogRecPtr);
}
if (tmpLsn !=InvalidXLogRecPtr) {
if (tmpLsn <= RecPtr) {
pg_usleep(200000);
continue;
} else {
ApplyLsn = tmpLsn;
}
} else {
ApplyLsn = InvalidXLogRecPtr;
}
break;
} }
} }
} }
@ -1099,7 +1114,7 @@ restart:
#ifndef PG_NOREPLAY #ifndef PG_NOREPLAY
if (IsBootstrapProcessingMode() != true && InitdbSingle!=true) { if (IsBootstrapProcessingMode() != true && InitdbSingle!=true) {
if (getpid() == startupPid) { if (getpid() == startupPid) {
if (push_standby == true || EnableHotStandby == false || *isPromoteIsTriggered) { if (push_standby == true) {
// Update shared-memory status // Update shared-memory status
XLogRecPtr prevPushPoint = PrePushPtr; XLogRecPtr prevPushPoint = PrePushPtr;
if (!XLogRecPtrIsInvalid(CheckPointPtr)) { if (!XLogRecPtrIsInvalid(CheckPointPtr)) {
@ -1111,8 +1126,23 @@ restart:
printf("curlsn==%x==prevPushPoint==%x==PushPoint==%x==last check point lsn====%x\n",RecPtr,prevPushPoint,PushPtr,CheckPointPtr); printf("curlsn==%x==prevPushPoint==%x==PushPoint==%x==last check point lsn====%x\n",RecPtr,prevPushPoint,PushPtr,CheckPointPtr);
CheckPointPtr = InvalidXLogRecPtr; CheckPointPtr = InvalidXLogRecPtr;
} }
if (ApplyLsn != InvalidXLogRecPtr && RecPtr >= ApplyLsn) { //need to tell push standby has new standby add
ApplyLsn = InvalidXLogRecPtr; while(ApplyLsn != InvalidXLogRecPtr && RecPtr >= ApplyLsn) {
XLogRecPtr tmpLsn = InvalidXLogRecPtr;
if (!he3mirror) {
tmpLsn = QueryMinLsn(InvalidXLogRecPtr);
}
if (tmpLsn !=InvalidXLogRecPtr) {
if (tmpLsn <= RecPtr) {
pg_usleep(10000);
continue;
} else {
ApplyLsn = tmpLsn;
}
} else {
ApplyLsn = InvalidXLogRecPtr;
}
break;
} }
} }
} }

2
src/backend/storage/smgr/md.c
View File

@ -827,7 +827,7 @@ int he3db_mdread_pagexlog(SMgrRelation reln, ForkNumber forknum, BlockNumber blo
return nbytes; return nbytes;
} }
pageKey.pageLsn = GetXLogPushToDisk(); pageKey.pageLsn = Max(GetXLogPushToDisk(), PageGetLSN(*buffer));
pageKey.replyLsn = lsn; pageKey.replyLsn = lsn;