Merge commit '8e8475aad70c0baf6a2711791539ffdde4e280aa' into PGPROEE9_6_scheduler

Vladimir Ershov · Vladimir Ershov · commit fc5e74ae9ad4 · 2017-02-13T19:45:00.000+03:00
diff --git a/contrib/pgpro_scheduler/pgpro_scheduler--2.0.sql b/contrib/pgpro_scheduler/pgpro_scheduler--2.0.sql
@@ -25,12 +25,14 @@ CREATE TABLE at_jobs_submitted(
    canceled boolean default false,
    submit_time timestamp with time zone default now()
 );
-CREATE INDEX at_jobs_submitted_node_at_idx on at_jobs_submitted (node,  at);
+CREATE INDEX ON at_jobs_submitted(at,submit_time);
+CREATE INDEX ON at_jobs_submitted (last_start_available, node);
 
 CREATE TABLE at_jobs_process(
 	start_time timestamp with time zone default now()
 ) INHERITS (at_jobs_submitted);
 
+ALTER TABLE at_jobs_process ADD  primary key (id);
 CREATE INDEX at_jobs_process_node_at_idx on at_jobs_process (node,  at);
 
 CREATE TABLE at_jobs_done(
@@ -39,6 +41,7 @@ CREATE TABLE at_jobs_done(
 	done_time timestamp with time zone default now()
 ) INHERITS (at_jobs_process);
 
+ALTER TABLE at_jobs_done ADD  primary key (id);
 CREATE INDEX at_jobs_done_node_at_idx on at_jobs_done (node,  at);
 
 CREATE TABLE cron(
@@ -64,6 +67,7 @@ CREATE TABLE cron(
    reason text,
    _next_exec_time timestamp with time zone
 );
+create index on cron (node);
 
 CREATE TABLE at(
    start_at timestamp with time zone,
diff --git a/contrib/pgpro_scheduler/src/scheduler_manager.c b/contrib/pgpro_scheduler/src/scheduler_manager.c
@@ -1492,6 +1492,7 @@ void manager_worker_main(Datum arg)
 	ctx = initialize_scheduler_manager_context(database, seg);
 	clean_at_table(ctx);
 	set_slots_stat_report(ctx);
+	SetConfigOption("enable_seqscan", "off", PGC_USERSET, PGC_S_SESSION);
 
 	while(!got_sigterm)
 	{
@@ -1509,7 +1510,7 @@ void manager_worker_main(Datum arg)
 			if(!got_sighup && !got_sigterm)
 			{
 				terminate_main_loop = 0;
-				while(1)
+				while(!got_sighup && !got_sigterm)
 				{
 					wait = 0;
 					if(check_parent_stop_signal(ctx))
@@ -1521,11 +1522,12 @@ void manager_worker_main(Datum arg)
 					wait += scheduler_start_jobs(ctx, CronJob);
 					scheduler_check_slots(ctx, &(ctx->at));
 					scheduler_check_slots(ctx, &(ctx->cron));
-					set_slots_stat_report(ctx);
+					scheduler_make_atcron_record(ctx);
+					/* set_slots_stat_report(ctx); */
 					if(wait == 0) break;
 				}
 				if(terminate_main_loop) break;
-				scheduler_make_atcron_record(ctx);
+				set_slots_stat_report(ctx); 
 				/* if there are any expired jobs to get rid of */
 				scheduler_vanish_expired_jobs(ctx, AtJob);
 				scheduler_vanish_expired_jobs(ctx, CronJob);
