NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit4bf901d

Vladimir Ershov

committed

Merge commit 'b4d0e53fd72107f5aaec361ab028e78699a36ea6' into PGPROEE9_6_scheduler

fix blocking on init_connection

2 parents7669343 +b4d0e53 commit4bf901dCopy full SHA for 4bf901d

File tree

3 files changed

+21

-16

lines changed

contrib/pgpro_scheduler
- src
  - scheduler_executor.c
  - scheduler_manager.c
- test/perl/t
  - jobExecuteWindow.t

3 files changed

+21

-16

lines changed

`‎contrib/pgpro_scheduler/src/scheduler_executor.c`

Lines changed: 14 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,29 +85,33 @@ void executor_worker_main(Datum arg)`
`85`	`85`
`86`	`86`	`CurrentResourceOwner=ResourceOwnerCreate(NULL,"pgpro_scheduler_executor");`
`87`	`87`	`init_worker_mem_ctx("ExecutorMemoryContext");`
	`88`	`+pqsignal(SIGTERM,handle_sigterm);`
	`89`	`+pqsignal(SIGHUP,worker_spi_sighup);`
	`90`	`+/* must be called before connection initialization otherwise infint wait`
	`91`	`+ * could happend if bgworker starts while one of 7th critical tables`
	`92`	`+ * being locked`
	`93`	`+ */`
	`94`	`+BackgroundWorkerUnblockSignals();`
`88`	`95`
`89`	`96`	`seg=dsm_attach(DatumGetInt32(arg));`
`90`	`97`	`if(seg==NULL)`
`91`	`98`	`ereport(ERROR,`
`92`	`99`	`(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),`
`93`	`100`	`errmsg("executor unable to map dynamic shared memory segment")));`
`94`	`101`	`shared=dsm_segment_address(seg);`
`95`		`-parent=BackendPidGetProc(MyBgworkerEntry->bgw_notify_pid);`
`96`	`102`
`97`	`103`	`if(shared->status!=SchdExecutorInit)`
`98`	`104`	`{`
`99`	`105`	`ereport(ERROR,`
`100`	`106`	`(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),`
`101`	`107`	`errmsg("executor corrupted dynamic shared memory segment")));`
`102`	`108`	`}`
	`109`	`+BackgroundWorkerInitializeConnection(shared->database,NULL);`
`103`	`110`
	`111`	`+parent=BackendPidGetProc(MyBgworkerEntry->bgw_notify_pid);`
`104`	`112`	`SetConfigOption("application_name","pgp-s executor",PGC_USERSET,PGC_S_SESSION);`
`105`	`113`	`pgstat_report_activity(STATE_RUNNING,"initialize");`
`106`		`-BackgroundWorkerInitializeConnection(shared->database,NULL);`
`107`	`114`
`108`		`-pqsignal(SIGTERM,handle_sigterm);`
`109`		`-pqsignal(SIGHUP,worker_spi_sighup);`
`110`		`-BackgroundWorkerUnblockSignals();`
`111`	`115`
`112`	`116`	`worker_jobs_limit=read_worker_job_limit();`
`113`	`117`
`@@ -667,6 +671,10 @@ void at_executor_worker_main(Datum arg)`
`667`	`671`
`668`	`672`	`CurrentResourceOwner=ResourceOwnerCreate(NULL,"pgpro_scheduler_at_executor");`
`669`	`673`	`init_worker_mem_ctx("ExecutorMemoryContext");`
	`674`	`+pqsignal(SIGTERM,handle_sigterm);`
	`675`	`+pqsignal(SIGHUP,worker_spi_sighup);`
	`676`	`+BackgroundWorkerUnblockSignals();`
	`677`	`+`
`670`	`678`	`seg=dsm_attach(DatumGetInt32(arg));`
`671`	`679`	`if(seg==NULL)`
`672`	`680`	`ereport(ERROR,`
`@@ -683,13 +691,9 @@ void at_executor_worker_main(Datum arg)`
`683`	`691`	`}`
`684`	`692`	`shared->start_at=GetCurrentTimestamp();`
`685`	`693`
	`694`	`+BackgroundWorkerInitializeConnection(shared->database,NULL);`
`686`	`695`	`SetConfigOption("application_name","pgp-s at executor",PGC_USERSET,PGC_S_SESSION);`
`687`	`696`	`pgstat_report_activity(STATE_RUNNING,"initialize");`
`688`		`-BackgroundWorkerInitializeConnection(shared->database,NULL);`
`689`		`-`
`690`		`-pqsignal(SIGTERM,handle_sigterm);`
`691`		`-pqsignal(SIGHUP,worker_spi_sighup);`
`692`		`-BackgroundWorkerUnblockSignals();`
`693`	`697`
`694`	`698`
`695`	`699`	`while(1)`

`‎contrib/pgpro_scheduler/src/scheduler_manager.c`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1784,10 +1784,15 @@ void manager_worker_main(Datum arg)`
`1784`	`1784`
`1785`	`1785`	`snprintf(database,NAMEDATALEN,"%s",MyBgworkerEntry->bgw_extra);`
`1786`	`1786`	`snprintf(buffer,1024,"pgp-s manager [%s]",database);`
`1787`		`-SetConfigOption("application_name",buffer,PGC_USERSET,PGC_S_SESSION);`
	`1787`	`+`
	`1788`	`+pqsignal(SIGHUP,worker_spi_sighup);`
	`1789`	`+pqsignal(SIGTERM,worker_spi_sigterm);`
	`1790`	`+BackgroundWorkerUnblockSignals();`
	`1791`	`+`
`1788`	`1792`
`1789`	`1793`	`BackgroundWorkerInitializeConnection(database,NULL);`
`1790`	`1794`	`elog(LOG,"Started scheduler manager for '%s'",database);`
	`1795`	`+SetConfigOption("application_name",buffer,PGC_USERSET,PGC_S_SESSION);`
`1791`	`1796`
`1792`	`1797`	`if(!checkSchedulerNamespace())`
`1793`	`1798`	`{`
`@@ -1800,10 +1805,6 @@ void manager_worker_main(Datum arg)`
`1800`	`1805`	`SetCurrentStatementStartTimestamp();`
`1801`	`1806`	`pgstat_report_activity(STATE_RUNNING,"initialize.");`
`1802`	`1807`
`1803`		`-pqsignal(SIGHUP,worker_spi_sighup);`
`1804`		`-pqsignal(SIGTERM,worker_spi_sigterm);`
`1805`		`-BackgroundWorkerUnblockSignals();`
`1806`		`-`
`1807`	`1808`	`parent_shared=dsm_segment_address(seg);`
`1808`	`1809`	`pgstat_report_activity(STATE_RUNNING,"initialize context");`
`1809`	`1810`	`changeChildBgwState(shared,SchdManagerConnected);`

`‎contrib/pgpro_scheduler/test/perl/t/jobExecuteWindow.t`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ ok($sth->execute()) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);`
`54`	`54`	`$sth->finish();`
`55`	`55`
`56`	`56`
`57`		`-sleep120;`
	`57`	`+sleep60;`
`58`	`58`	`$query ="SELECT count(*) FROM test_results";`
`59`	`59`	`$sth =$dbh->prepare($query);`
`60`	`60`	`ok($sth->execute())or (print$DBI::errstrand$dbh->disconnect()and BAIL_OUT);`

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!

Commit4bf901d

File tree

3 files changed

3 files changed

`‎contrib/pgpro_scheduler/src/scheduler_executor.c`

`‎contrib/pgpro_scheduler/src/scheduler_manager.c`

`‎contrib/pgpro_scheduler/test/perl/t/jobExecuteWindow.t`

0 commit comments