Merge commit '3f85a66b4356abb6de3b232103ae8284feefb6ff' into PGPROEE9_6_scheduler

Author: Vladimir Ershov

contrib/pgpro_scheduler/pgpro_scheduler--2.0.sql

@@ -284,7 +284,12 @@ DECLARE
   cron_id INTEGER;
 BEGIN
   cron_id := NEW.id; 
-  IF NOT NEW.active OR NEW.broken OR NEW.rule <> OLD.rule OR NEW.postpone <> OLD.postpone  THEN
+  IF NOT NEW.active OR NEW.broken OR
+  	coalesce(NEW.rule <> OLD.rule, true) OR
+	coalesce(NEW.postpone <> OLD.postpone, true)  OR
+	coalesce(NEW.start_date <> OLD.start_date, true) OR
+	coalesce(NEW.end_date <> OLD.end_date, true)
+  THEN
      DELETE FROM at WHERE cron = cron_id AND active = false;
   END IF;
   RETURN OLD;
@@ -1206,9 +1211,9 @@ BEGIN
 	END IF;
 
 	IF usename = '___all___' THEN
-		sql_cmd := 'SELECT * FROM log as l , cron as cron WHERE cron.id = l.cron';
+		sql_cmd := 'SELECT * FROM log as l LEFT OUTER JOIN cron ON cron.id = l.cron';
 	ELSE
-		sql_cmd := 'SELECT * FROM log as l , cron as cron WHERE cron.executor = ''' || usename || ''' AND cron.id = l.cron';
+		sql_cmd := 'SELECT * FROM log as l LEFT OUTER JOIN cron ON cron.executor = ''' || usename || ''' AND cron.id = l.cron';
 	END IF;
 
 	FOR ii IN EXECUTE sql_cmd LOOP

contrib/pgpro_scheduler/src/pgpro_scheduler.c

@@ -408,7 +408,7 @@ pg_scheduler_startup(void)
 	worker.bgw_flags = BGWORKER_SHMEM_ACCESS |
 		BGWORKER_BACKEND_DATABASE_CONNECTION;
 	worker.bgw_start_time = BgWorkerStart_ConsistentState;
-	worker.bgw_restart_time = BGW_NEVER_RESTART;
+	worker.bgw_restart_time = 10;
 	worker.bgw_main = NULL;
 	worker.bgw_notify_pid = 0;
 	worker.bgw_main_arg = Int32GetDatum(0);

contrib/pgpro_scheduler/src/scheduler_manager.c

@@ -378,7 +378,7 @@ scheduler_task_t *scheduler_get_active_tasks(scheduler_manager_ctx_t *ctx, int *
 
 	*nt = 0;
 	initStringInfo(&sql);
-	appendStringInfo(&sql, "select id, rule, postpone, _next_exec_time, next_time_statement from cron where active and not broken and (start_date <= 'now' or start_date is null) and (end_date <= 'now' or end_date is null) and node = '%s'", ctx->nodename);
+	appendStringInfo(&sql, "select id, rule, postpone, _next_exec_time, next_time_statement from cron where active and not broken and (start_date <= 'now' or start_date is null) and (end_date >= 'now' or end_date is null) and node = '%s'", ctx->nodename);
 
 	pgstat_report_activity(STATE_RUNNING, "select 'at' tasks");
 
@@ -643,7 +643,14 @@ TimestampTz *scheduler_calc_next_task_time(scheduler_task_t *task, TimestampTz s
 		return NULL;
 	}
 
+/* to avoid to set job on minute has already passed  we add 1 minute */
 	curr = start;
+#ifdef HAVE_INT64_TIMESTAMP
+	curr += USECS_PER_MINUTE;
+#else
+	curr += SECS_PER_MINUTE;
+#endif
+
 	nextarray = worker_alloc(sizeof(TimestampTz) * REALLOC_STEP);
 	convert_rule_to_cron(task->rule, cron);
 

contrib/pgpro_scheduler/test/make_test_env.sql

@@ -108,7 +108,6 @@ SELECT schedule.create_job(
 	'{
 		"name": "Test #2: every 15 minute, not sngl transaction",
 		"cron": "*/15 * * * *",
-		"cron": "* * * * *",
 		"commands": [
 			"insert into result2 (time_mark, n, text) values (now(), 1, ''start job'')",
 			"insert into result2 (time_mark, n, text) values (now(), 2, random_finish())"
@@ -122,7 +121,6 @@ SELECT schedule.create_job(
 	'{
 		"name": "Test #3: 2/3 minute, sngl transaction",
 		"cron": "*/15 * * * *",
-		"cron": "* * * * *",
 		"commands": [
 			"insert into result3 (time_mark, n, text) values (now(), 1, ''start job'')",
 			"insert into result3 (time_mark, n, text) values (now(), 2, random_finish())"