Commit2f160bf

Vladimir Ershov

committed

vanish at works

1 parentc795670 commit2f160bfCopy full SHA for 2f160bf

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ BEGIN`
`192`	`192`	`USING HINT='you cannot use''run_after'' and''depends_on'' parameters at the same time';`
`193`	`193`	`END IF;`
`194`	`194`
`195`		`-IF max_wait_intervalIS NOT NULLAND run_after ISNULL THEN`
	`195`	`+IF max_wait_intervalIS NOT NULLAND run_afterISNOTNULL THEN`
`196`	`196`	`last_avail := run_after+ max_wait_interval;`
`197`	`197`	`ELSE`
`198`	`198`	`last_avail :=NULL;`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1177,8 +1177,13 @@ int scheduler_vanish_expired_jobs(scheduler_manager_ctx_t *ctx, task_type_t type`
`1177`	`1177`	`intmove_ret;`
`1178`	`1178`	`char*ts;`
`1179`	`1179`	`boolts_hires= false;`
	`1180`	`+TimestampTz*check_time;`
	`1181`	`+intinterval;`
	`1182`	`+`
	`1183`	`+check_time=type==CronJob ?&(ctx->next_expire_time):&(ctx->next_at_expire_time);`
	`1184`	`+interval=type==CronJob ?30:25;`
`1180`	`1185`
`1181`		`-if(ctx->next_expire_time>GetCurrentTimestamp())return-1;`
	`1186`	`+if(*check_time>GetCurrentTimestamp())return-1;`
`1182`	`1187`	`pgstat_report_activity(STATE_RUNNING,"vanish expired tasks");`
`1183`	`1188`	`START_SPI_SNAP();`
`1184`	`1189`	`expired=type==CronJob ?`
`@@ -1227,7 +1232,7 @@ int scheduler_vanish_expired_jobs(scheduler_manager_ctx_t *ctx, task_type_t type`
`1227`	`1232`	`ret=0;`
`1228`	`1233`	`}`
`1229`	`1234`	`STOP_SPI_SNAP();`
`1230`		`-ctx->next_expire_time=timestamp_add_seconds(0,30);`
	`1235`	`+*check_time=timestamp_add_seconds(0,interval);`
`1231`	`1236`	`pgstat_report_activity(STATE_IDLE,"vanish expired tasks done");`
`1232`	`1237`
`1233`	`1238`	`returnret;`

Comments

(0)