NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit280c53e

committed

A collection of small fixes for logical replication.

* Be sure to reset the launcher's pid (LogicalRepCtx->launcher_pid) to 0 even when the launcher emits an error.* Declare ApplyLauncherWakeup() as a static function because it's called only in launcher.c.* Previously IsBackendPId() was used to check whether the launcher's pid was valid. IsBackendPid() was necessary because there was the bug where the launcher's pid was not reset to 0. But now it's fixed, so IsBackendPid() is not necessary and this patch removes it.Author: Masahiko SawadaReviewed-by: Kyotaro HoriguchiReported-by: Fujii MasaoDiscussion:http://postgr.es/m/CAHGQGwFDWh_Qr-q_GEMpD+qH=vYPMdVqw=ZOSY3kX_Pna9R9SA@mail.gmail.com

1 parent39a6772 commit280c53eCopy full SHA for 280c53e

File tree

2 files changed

+17

-3

lines changed

src
- backend/replication/logical
  - launcher.c
- include/replication
  - logicallauncher.h

2 files changed

+17

-3

lines changed

`‎src/backend/replication/logical/launcher.c`

Lines changed: 17 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,8 @@ typedef struct LogicalRepCtxStruct`
`72`	`72`
`73`	`73`	`LogicalRepCtxStruct*LogicalRepCtx;`
`74`	`74`
	`75`	`+staticvoidApplyLauncherWakeup(void);`
	`76`	`+staticvoidlogicalrep_launcher_onexit(intcode,Datumarg);`
`75`	`77`	`staticvoidlogicalrep_worker_onexit(intcode,Datumarg);`
`76`	`78`	`staticvoidlogicalrep_worker_detach(void);`
`77`	`79`
`@@ -480,6 +482,17 @@ logicalrep_worker_detach(void)`
`480`	`482`	`LWLockRelease(LogicalRepWorkerLock);`
`481`	`483`	`}`
`482`	`484`
	`485`	`+/*`
	`486`	`+ * Cleanup function for logical replication launcher.`
	`487`	`+ *`
	`488`	`+ * Called on logical replication launcher exit.`
	`489`	`+ */`
	`490`	`+staticvoid`
	`491`	`+logicalrep_launcher_onexit(intcode,Datumarg)`
	`492`	`+{`
	`493`	`+LogicalRepCtx->launcher_pid=0;`
	`494`	`+}`
	`495`	`+`
`483`	`496`	`/*`
`484`	`497`	`* Cleanup function.`
`485`	`498`	`*`
`@@ -643,10 +656,10 @@ ApplyLauncherWakeupAtCommit(void)`
`643`	`656`	`on_commit_launcher_wakeup= true;`
`644`	`657`	`}`
`645`	`658`
`646`		`-void`
	`659`	`+staticvoid`
`647`	`660`	`ApplyLauncherWakeup(void)`
`648`	`661`	`{`
`649`		`-if (IsBackendPid(LogicalRepCtx->launcher_pid))`
	`662`	`+if (LogicalRepCtx->launcher_pid!=0)`
`650`	`663`	`kill(LogicalRepCtx->launcher_pid,SIGUSR1);`
`651`	`664`	`}`
`652`	`665`
`@@ -659,6 +672,8 @@ ApplyLauncherMain(Datum main_arg)`
`659`	`672`	`ereport(DEBUG1,`
`660`	`673`	`(errmsg("logical replication launcher started")));`
`661`	`674`
	`675`	`+before_shmem_exit(logicalrep_launcher_onexit, (Datum)0);`
	`676`	`+`
`662`	`677`	`/* Establish signal handlers. */`
`663`	`678`	`pqsignal(SIGHUP,logicalrep_worker_sighup);`
`664`	`679`	`pqsignal(SIGTERM,logicalrep_worker_sigterm);`

`‎src/include/replication/logicallauncher.h`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ extern void ApplyLauncherMain(Datum main_arg);`
`21`	`21`	`externSizeApplyLauncherShmemSize(void);`
`22`	`22`	`externvoidApplyLauncherShmemInit(void);`
`23`	`23`
`24`		`-externvoidApplyLauncherWakeup(void);`
`25`	`24`	`externvoidApplyLauncherWakeupAtCommit(void);`
`26`	`25`	`externvoidAtCommit_ApplyLauncher(void);`
`27`	`26`

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!

Commit280c53e

File tree

2 files changed

2 files changed

`‎src/backend/replication/logical/launcher.c`

`‎src/include/replication/logicallauncher.h`

0 commit comments