Commit76a2ee6

Vladimir Ershov

committed

depends_on feature

1 parent2f160bf commit76a2ee6Copy full SHA for 76a2ee6

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,8 @@ job_t _at_get_jobs_to_do(char nodename, int n, int is_error, int limit)`
`166`	`166`	`intret,got,i;`
`167`	`167`	`Oidargtypes[2]= {TEXTOID,INT4OID };`
`168`	`168`	`Datumvalues[2];`
`169`		`-constchar*get_job_sql="select id, at, last_start_available, max_run_time, executor from ONLY at_jobs_submitted where at <= 'now' and (last_start_available is NULL OR last_start_available > 'now') AND node = $1 order by at, submit_time limit $2";`
	`169`	`+/* const char get_job_sql = "select id, at, last_start_available, max_run_time, executor from ONLY at_jobs_submitted where at <= 'now' and (last_start_available is NULL OR last_start_available > 'now') AND node = $1 order by at, submit_time limit $2"; /`
	`170`	`+constcharget_job_sql="select id, at, last_start_available, max_run_time, executor from ONLY at_jobs_submitted s where ((not exists ( select from ONLY at_jobs_submitted s2 where s2.id = any(s.depends_on)) AND not exists ( select * from ONLY at_jobs_process p where p.id = any(s.depends_on)) AND s.depends_on is NOT NULL and s.at IS NULL) OR ( s.at IS NOT NULL AND at <= 'now' and (last_start_available is NULL OR last_start_available > 'now'))) and node = $1 order by at, submit_time limit $2";`
`170`	`171`
`171`	`172`	`is_error=n=0;`
`172`	`173`	`START_SPI_SNAP();`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1210,7 +1210,7 @@ int scheduler_vanish_expired_jobs(scheduler_manager_ctx_t *ctx, task_type_t type`
`1210`	`1210`	`}`
`1211`	`1211`	`else`
`1212`	`1212`	`{`
`1213`		`-set_job_error(&expired[i],"jobstart time %sexpired",ts);`
	`1213`	`+set_job_error(&expired[i],"job expired");`
`1214`	`1214`	`}`
`1215`	`1215`
`1216`	`1216`	`move_ret=move_job_to_log(&expired[i],0, false);`

Comments

(0)