NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit5c83915

committed

reload config on sighup in bgworkers

1 parent9a51ff8 commit5c83915Copy full SHA for 5c83915

File tree

4 files changed

+38

-7

lines changed

arbiter.c
bgwpool.c
tests2
- support
  - two_nodes.yml
- test_major.py

4 files changed

+38

-7

lines changed

`‎arbiter.c`

Lines changed: 24 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -715,6 +715,7 @@ static void MtmSender(Datum arg)`
`715`	`715`	`pqsignal(SIGINT,SetStop);`
`716`	`716`	`pqsignal(SIGQUIT,SetStop);`
`717`	`717`	`pqsignal(SIGTERM,SetStop);`
	`718`	`+pqsignal(SIGHUP,PostgresSigHupHandler);`
`718`	`719`
`719`	`720`	`/* We're now ready to receive signals */`
`720`	`721`	`BackgroundWorkerUnblockSignals();`
`@@ -733,6 +734,12 @@ static void MtmSender(Datum arg)`
`733`	`734`	`PGSemaphoreLock(&Mtm->sendSemaphore);`
`734`	`735`	`CHECK_FOR_INTERRUPTS();`
`735`	`736`
	`737`	`+if (ConfigReloadPending)`
	`738`	`+{`
	`739`	`+ConfigReloadPending= false;`
	`740`	`+ProcessConfigFile(PGC_SIGHUP);`
	`741`	`+}`
	`742`	`+`
`736`	`743`	`MtmCheckHeartbeat();`
`737`	`744`	`/*`
`738`	`745`	`* Use shared lock to improve locality,`
`@@ -794,6 +801,7 @@ static void MtmMonitor(Datum arg)`
`794`	`801`	`pqsignal(SIGINT,SetStop);`
`795`	`802`	`pqsignal(SIGQUIT,SetStop);`
`796`	`803`	`pqsignal(SIGTERM,SetStop);`
	`804`	`+pqsignal(SIGHUP,PostgresSigHupHandler);`
`797`	`805`
`798`	`806`	`MtmBackgroundWorker= true;`
`799`	`807`
`@@ -808,6 +816,13 @@ static void MtmMonitor(Datum arg)`
`808`	`816`	`if (rc&WL_POSTMASTER_DEATH) {`
`809`	`817`	`break;`
`810`	`818`	`}`
	`819`	`+`
	`820`	`+if (ConfigReloadPending)`
	`821`	`+{`
	`822`	`+ConfigReloadPending= false;`
	`823`	`+ProcessConfigFile(PGC_SIGHUP);`
	`824`	`+}`
	`825`	`+`
`811`	`826`	`MtmRefreshClusterStatus();`
`812`	`827`	`}`
`813`	`828`	`}`
`@@ -833,6 +848,7 @@ static void MtmReceiver(Datum arg)`
`833`	`848`	`pqsignal(SIGINT,SetStop);`
`834`	`849`	`pqsignal(SIGQUIT,SetStop);`
`835`	`850`	`pqsignal(SIGTERM,SetStop);`
	`851`	`+pqsignal(SIGHUP,PostgresSigHupHandler);`
`836`	`852`
`837`	`853`	`MtmBackgroundWorker= true;`
`838`	`854`
`@@ -868,7 +884,14 @@ static void MtmReceiver(Datum arg)`
`868`	`884`	`for (j=0;j<n;j++) {`
`869`	`885`	`if (events[j].events&EPOLLIN)`
`870`	`886`	`#else`
`871`		`-fd_setevents;`
	`887`	`+fd_setevents;`
	`888`	`+`
	`889`	`+if (ConfigReloadPending)`
	`890`	`+{`
	`891`	`+ConfigReloadPending= false;`
	`892`	`+ProcessConfigFile(PGC_SIGHUP);`
	`893`	`+}`
	`894`	`+`
`872`	`895`	`do {`
`873`	`896`	`structtimevaltv;`
`874`	`897`	`events=inset;`

`‎bgwpool.c`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`
`15`	`15`	`#include"bgwpool.h"`
`16`	`16`	`#include"multimaster.h"`
	`17`	`+#include"utils/guc.h"`
`17`	`18`
`18`	`19`	`boolMtmIsLogicalReceiver;`
`19`	`20`	`intMtmMaxWorkers;`
`@@ -43,14 +44,21 @@ static void BgwPoolMainLoop(BgwPool* pool)`
`43`	`44`	`pqsignal(SIGINT,BgwShutdownWorker);`
`44`	`45`	`pqsignal(SIGQUIT,BgwShutdownWorker);`
`45`	`46`	`pqsignal(SIGTERM,BgwShutdownWorker);`
	`47`	`+pqsignal(SIGHUP,PostgresSigHupHandler);`
`46`	`48`
`47`	`49`	`BackgroundWorkerUnblockSignals();`
`48`	`50`	`BackgroundWorkerInitializeConnection(pool->dbname,pool->dbuser);`
`49`	`51`	`ActivePortal=&fakePortal;`
`50`	`52`	`ActivePortal->status=PORTAL_ACTIVE;`
`51`	`53`	`ActivePortal->sourceText="";`
`52`	`54`
`53`		`-while (true) {`
	`55`	`+while (true) {`
	`56`	`+if (ConfigReloadPending)`
	`57`	`+{`
	`58`	`+ConfigReloadPending= false;`
	`59`	`+ProcessConfigFile(PGC_SIGHUP);`
	`60`	`+}`
	`61`	`+`
`54`	`62`	`PGSemaphoreLock(&pool->available);`
`55`	`63`	`SpinLockAcquire(&pool->lock);`
`56`	`64`	`if (pool->shutdown) {`

`‎tests2/support/two_nodes.yml`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ services:`
`12`	`12`	`POSTGRES_USER:'pg'`
`13`	`13`	`POSTGRES_DB:'regression'`
`14`	`14`	`NODE_ID:1`
`15`		`-MAJOR:'on'`
	`15`	`+MAJOR:'off'`
`16`	`16`	`CONNSTRS:>-`
`17`	`17`	`dbname=regression user=pg host=node1,`
`18`	`18`	`dbname=regression user=pg host=node2`

`‎tests2/test_major.py`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,10 +72,10 @@ def tearDown(self):`
`72`	`72`	`deftest_partition_major(self):`
`73`	`73`	`print('### test_partition_major ###')`
`74`	`74`
`75`		`-#MajorTest.client.execute(0, [`
`76`		`-# 'alter system set multimaster.major_node to true',`
`77`		`-#'select pg_reload_conf();'`
`78`		`-#])`
	`75`	`+MajorTest.client.execute(0, [`
	`76`	`+'alter system set multimaster.major_node to true',`
	`77`	`+'select pg_reload_conf()'`
	`78`	`+ ])`
`79`	`79`
`80`	`80`	`aggs_failure,aggs=self.performFailure(SingleNodePartition('node2'))`
`81`	`81`

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!

Commit5c83915

File tree

4 files changed

4 files changed

`‎arbiter.c`

`‎bgwpool.c`

`‎tests2/support/two_nodes.yml`

`‎tests2/test_major.py`

0 commit comments