Commit7e974b5

Vladimir Ershov

committed

fix execution window, get_log SELECT + OUTER JOIN && bgworker_restart time

1 parent62b316b commit7e974b5Copy full SHA for 7e974b5

File tree

+10

-5

lines changed

+10

-5

lines changed

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,12 @@ DECLARE`
`284`	`284`	`cron_idINTEGER;`
`285`	`285`	`BEGIN`
`286`	`286`	`cron_id :=NEW.id;`
`287`		`- IF NOTNEW.activeORNEW.brokenORNEW.rule<>OLD.ruleORNEW.postpone<>OLD.postpone THEN`
	`287`	`+ IF NOTNEW.activeORNEW.brokenOR`
	`288`	`+ coalesce(NEW.rule<>OLD.rule, true)OR`
	`289`	`+coalesce(NEW.postpone<>OLD.postpone, true)OR`
	`290`	`+coalesce(NEW.start_date<>OLD.start_date, true)OR`
	`291`	`+coalesce(NEW.end_date<>OLD.end_date, true)`
	`292`	`+ THEN`
`288`	`293`	`DELETEFROM atWHERE cron= cron_idAND active= false;`
`289`	`294`	`END IF;`
`290`	`295`	`RETURN OLD;`
`@@ -1206,9 +1211,9 @@ BEGIN`
`1206`	`1211`	`END IF;`
`1207`	`1212`
`1208`	`1213`	`IF usename='___all___' THEN`
`1209`		`-sql_cmd :='SELECT * FROM log as l, cron as cronWHERE cron.id = l.cron';`
	`1214`	`+sql_cmd :='SELECT * FROM log as lLEFT OUTER JOIN cronON cron.id = l.cron';`
`1210`	`1215`	`ELSE`
`1211`		`-sql_cmd :='SELECT * FROM log as l, cron as cronWHERE cron.executor ='''\|\| usename\|\|''' AND cron.id = l.cron';`
	`1216`	`+sql_cmd :='SELECT * FROM log as lLEFT OUTER JOIN cronON cron.executor ='''\|\| usename\|\|''' AND cron.id = l.cron';`
`1212`	`1217`	`END IF;`
`1213`	`1218`
`1214`	`1219`	`FOR iiIN EXECUTE sql_cmd LOOP`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ pg_scheduler_startup(void)`
`408`	`408`	`worker.bgw_flags=BGWORKER_SHMEM_ACCESS \|`
`409`	`409`	`BGWORKER_BACKEND_DATABASE_CONNECTION;`
`410`	`410`	`worker.bgw_start_time=BgWorkerStart_ConsistentState;`
`411`		`-worker.bgw_restart_time=BGW_NEVER_RESTART;`
	`411`	`+worker.bgw_restart_time=10;`
`412`	`412`	`worker.bgw_main=NULL;`
`413`	`413`	`worker.bgw_notify_pid=0;`
`414`	`414`	`worker.bgw_main_arg=Int32GetDatum(0);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ scheduler_task_t scheduler_get_active_tasks(scheduler_manager_ctx_t ctx, int *`
`378`	`378`
`379`	`379`	`*nt=0;`
`380`	`380`	`initStringInfo(&sql);`
`381`		`-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);`
	`381`	`+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);`
`382`	`382`
`383`	`383`	`pgstat_report_activity(STATE_RUNNING,"select 'at' tasks");`
`384`	`384`

Comments

(0)