NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitba1868b

committed

Minor bug fix and cleanup from self-review of sync rep queues patch.

1 parent73f617f commitba1868bCopy full SHA for ba1868b

File tree

3 files changed

-10

lines changed

src/backend
- postmaster
  - checkpointer.c
  - postmaster.c
- replication
  - syncrep.c

3 files changed

-10

lines changed

`‎src/backend/postmaster/checkpointer.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,7 @@ CheckpointWriteDelay(int flags, double progress)`
`673`	`673`	`got_SIGHUP= false;`
`674`	`674`	`ProcessConfigFile(PGC_SIGHUP);`
`675`	`675`	`/* update global shmem state for sync rep */`
`676`		`-SyncRepUpdateSyncStandbysDefined();`
	`676`	`+UpdateSharedMemoryConfig();`
`677`	`677`	`}`
`678`	`678`
`679`	`679`	`AbsorbFsyncRequests();`

`‎src/backend/postmaster/postmaster.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4212,13 +4212,13 @@ sigusr1_handler(SIGNAL_ARGS)`
`4212`	`4212`	`FatalError= false;`
`4213`	`4213`
`4214`	`4214`	`/*`
`4215`		`- * Crank up the backgroundwriter.It doesn't matter if this fails,`
	`4215`	`+ * Crank up the backgroundwriters.It doesn't matter if this fails,`
`4216`	`4216`	`* we'll just try again later.`
`4217`	`4217`	`*/`
`4218`		`-Assert(BgWriterPID==0);`
`4219`		`-BgWriterPID=StartBackgroundWriter();`
`4220`	`4218`	`Assert(CheckpointerPID==0);`
`4221`	`4219`	`CheckpointerPID=StartCheckpointer();`
	`4220`	`+Assert(BgWriterPID==0);`
	`4221`	`+BgWriterPID=StartBackgroundWriter();`
`4222`	`4222`
`4223`	`4223`	`pmState=PM_RECOVERY;`
`4224`	`4224`	`}`

`‎src/backend/replication/syncrep.c`

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,6 @@ char *SyncRepStandbyNames;`
`62`	`62`	`#defineSyncStandbysDefined() \`
`63`	`63`	`(SyncRepStandbyNames != NULL && SyncRepStandbyNames[0] != '\0')`
`64`	`64`
`65`		`-#defineSyncRepRequested() \`
`66`		`-(max_wal_senders > 0 && synchronous_commit > SYNCHRONOUS_COMMIT_LOCAL_FLUSH)`
`67`		`-`
`68`	`65`	`staticboolannounce_next_takeover= true;`
`69`	`66`
`70`	`67`	`staticintSyncRepWaitMode=SYNC_REP_NO_WAIT;`
`@@ -98,6 +95,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)`
`98`	`95`	`{`
`99`	`96`	`char*new_status=NULL;`
`100`	`97`	`constchar*old_status;`
	`98`	`+intmode=SyncRepWaitMode;`
`101`	`99`
`102`	`100`	`/*`
`103`	`101`	`* Fast exit if user has not requested sync replication, or there are no`
`@@ -122,7 +120,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)`
`122`	`120`	`* be a low cost check.`
`123`	`121`	`*/`
`124`	`122`	`if (!WalSndCtl->sync_standbys_defined\|\|`
`125`		`-XLByteLE(XactCommitLSN,WalSndCtl->lsn[SyncRepWaitMode]))`
	`123`	`+XLByteLE(XactCommitLSN,WalSndCtl->lsn[mode]))`
`126`	`124`	`{`
`127`	`125`	`LWLockRelease(SyncRepLock);`
`128`	`126`	`return;`
`@@ -134,8 +132,8 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)`
`134`	`132`	`*/`
`135`	`133`	`MyProc->waitLSN=XactCommitLSN;`
`136`	`134`	`MyProc->syncRepState=SYNC_REP_WAITING;`
`137`		`-SyncRepQueueInsert(SyncRepWaitMode);`
`138`		`-Assert(SyncRepQueueIsOrderedByLSN(SyncRepWaitMode));`
	`135`	`+SyncRepQueueInsert(mode);`
	`136`	`+Assert(SyncRepQueueIsOrderedByLSN(mode));`
`139`	`137`	`LWLockRelease(SyncRepLock);`
`140`	`138`
`141`	`139`	`/* Alter ps display to show waiting for sync rep. */`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitba1868b

File tree

3 files changed

3 files changed

`‎src/backend/postmaster/checkpointer.c`

`‎src/backend/postmaster/postmaster.c`

`‎src/backend/replication/syncrep.c`

0 commit comments