Merge commit 'b4d0e53fd72107f5aaec361ab028e78699a36ea6' into PGPROEE9_6_scheduler

Vladimir Ershov · Vladimir Ershov · commit 4bf901dc5767 · 2017-06-19T15:45:24.000+03:00
fix blocking on init_connection
diff --git a/contrib/pgpro_scheduler/src/scheduler_executor.c b/contrib/pgpro_scheduler/src/scheduler_executor.c
@@ -85,29 +85,33 @@ void executor_worker_main(Datum arg)
 
 	CurrentResourceOwner = ResourceOwnerCreate(NULL, "pgpro_scheduler_executor");
 	init_worker_mem_ctx("ExecutorMemoryContext");
+	pqsignal(SIGTERM, handle_sigterm);
+	pqsignal(SIGHUP, worker_spi_sighup);
+	/* must be called before connection initialization otherwise infint wait
+	 * could happend if bgworker starts while one of 7th critical tables
+	 * being locked 
+	 */
+	BackgroundWorkerUnblockSignals();
 
 	seg = dsm_attach(DatumGetInt32(arg));
 	if(seg == NULL)
 		ereport(ERROR,
 			(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 			 errmsg("executor unable to map dynamic shared memory segment")));
 	shared = dsm_segment_address(seg);
-	parent = BackendPidGetProc(MyBgworkerEntry->bgw_notify_pid);
 
 	if(shared->status != SchdExecutorInit)
 	{
 		ereport(ERROR,
 			(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 			 errmsg("executor corrupted dynamic shared memory segment")));
 	}
+	BackgroundWorkerInitializeConnection(shared->database, NULL);
 
+	parent = BackendPidGetProc(MyBgworkerEntry->bgw_notify_pid);
 	SetConfigOption("application_name", "pgp-s executor", PGC_USERSET, PGC_S_SESSION);
 	pgstat_report_activity(STATE_RUNNING, "initialize");
-	BackgroundWorkerInitializeConnection(shared->database, NULL);
 
-	pqsignal(SIGTERM, handle_sigterm);
-	pqsignal(SIGHUP, worker_spi_sighup);
-	BackgroundWorkerUnblockSignals();
 
 	worker_jobs_limit = read_worker_job_limit();
 
@@ -667,6 +671,10 @@ void at_executor_worker_main(Datum arg)
 
 	CurrentResourceOwner = ResourceOwnerCreate(NULL, "pgpro_scheduler_at_executor");
 	init_worker_mem_ctx("ExecutorMemoryContext");
+	pqsignal(SIGTERM, handle_sigterm);
+	pqsignal(SIGHUP, worker_spi_sighup);
+	BackgroundWorkerUnblockSignals();
+
 	seg = dsm_attach(DatumGetInt32(arg));
 	if(seg == NULL)
 		ereport(ERROR,
@@ -683,13 +691,9 @@ void at_executor_worker_main(Datum arg)
 	}
 	shared->start_at = GetCurrentTimestamp();
 
+	BackgroundWorkerInitializeConnection(shared->database, NULL);
 	SetConfigOption("application_name", "pgp-s at executor", PGC_USERSET, PGC_S_SESSION);
 	pgstat_report_activity(STATE_RUNNING, "initialize");
-	BackgroundWorkerInitializeConnection(shared->database, NULL);
-
-	pqsignal(SIGTERM, handle_sigterm);
-	pqsignal(SIGHUP, worker_spi_sighup);
-	BackgroundWorkerUnblockSignals();
 
 
 	while(1)
diff --git a/contrib/pgpro_scheduler/src/scheduler_manager.c b/contrib/pgpro_scheduler/src/scheduler_manager.c
@@ -1784,10 +1784,15 @@ void manager_worker_main(Datum arg)
 
 	snprintf(database, NAMEDATALEN, "%s", MyBgworkerEntry->bgw_extra);
 	snprintf(buffer, 1024, "pgp-s manager [%s]", database);
-	SetConfigOption("application_name", buffer, PGC_USERSET, PGC_S_SESSION);
+
+	pqsignal(SIGHUP, worker_spi_sighup);
+	pqsignal(SIGTERM, worker_spi_sigterm);
+	BackgroundWorkerUnblockSignals();
+
 
 	BackgroundWorkerInitializeConnection(database, NULL);
 	elog(LOG, "Started scheduler manager for '%s'", database);
+	SetConfigOption("application_name", buffer, PGC_USERSET, PGC_S_SESSION);
 
 	if(!checkSchedulerNamespace())
 	{
@@ -1800,10 +1805,6 @@ void manager_worker_main(Datum arg)
 	SetCurrentStatementStartTimestamp();
 	pgstat_report_activity(STATE_RUNNING, "initialize.");
 
-	pqsignal(SIGHUP, worker_spi_sighup);
-	pqsignal(SIGTERM, worker_spi_sigterm);
-	BackgroundWorkerUnblockSignals();
-
 	parent_shared = dsm_segment_address(seg);
 	pgstat_report_activity(STATE_RUNNING, "initialize context");
 	changeChildBgwState(shared, SchdManagerConnected);
diff --git a/contrib/pgpro_scheduler/test/perl/t/jobExecuteWindow.t b/contrib/pgpro_scheduler/test/perl/t/jobExecuteWindow.t
@@ -54,7 +54,7 @@ ok($sth->execute()) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);
 $sth->finish();
 
 
-sleep 120;
+sleep 60;
 $query = "SELECT count(*) FROM test_results";
 $sth = $dbh->prepare($query);
 ok($sth->execute()) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);
