depends_on feature

Vladimir Ershov · Vladimir Ershov · commit 76a2ee629dfa · 2017-02-10T18:19:38.000+03:00
diff --git a/src/scheduler_job.c b/src/scheduler_job.c
@@ -166,7 +166,8 @@ job_t *_at_get_jobs_to_do(char *nodename, int *n, int *is_error, int limit)
 	int ret, got, i;
 	Oid argtypes[2] = { TEXTOID, INT4OID };
 	Datum values[2];
-	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";
+	/* 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"; */
+	const char *get_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";
 
 	*is_error = *n = 0;
 	START_SPI_SNAP();
diff --git a/src/scheduler_manager.c b/src/scheduler_manager.c
@@ -1210,7 +1210,7 @@ int scheduler_vanish_expired_jobs(scheduler_manager_ctx_t *ctx, task_type_t type
 			}
 			else
 			{
-				set_job_error(&expired[i], "job start time %s expired", ts);
+				set_job_error(&expired[i], "job expired");
 			}
 
 			move_ret  = move_job_to_log(&expired[i], 0, false);

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], "job start time %s expired", 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);`