cancel job added

Vladimir Ershov · Vladimir Ershov · commit 77d2473f3fcc · 2017-02-13T14:39:29.000+03:00
diff --git a/pgpro_scheduler--2.0.sql b/pgpro_scheduler--2.0.sql
@@ -22,6 +22,7 @@ CREATE TABLE at_jobs_submitted(
    resubmit_limit bigint default 100,
    postpone interval,
    max_run_time	interval,
+   canceled boolean default false,
    submit_time timestamp with time zone default now()
 );
 CREATE INDEX at_jobs_submitted_node_at_idx on at_jobs_submitted (node,  at);
@@ -161,6 +162,31 @@ CREATE FUNCTION resubmit(run_after interval default NULL)
   AS 'MODULE_PATHNAME', 'resubmit'
   LANGUAGE C IMMUTABLE;
 
+CREATE FUNCTION cancel_job(job_id bigint)  RETURNS boolean AS
+$BODY$
+DECLARE
+	s_count int;
+BEGIN
+	EXECUTE 'SELECT count(*)  FROM at_jobs_submitted WHERE owner  = session_user AND id = $1' INTO s_count USING job_id;
+	IF s_count > 0 THEN
+		UPDATE at_jobs_submitted SET canceled = true WHERE "id" = job_id;
+		WITH moved_rows AS (DELETE from ONLY at_jobs_submitted a WHERE a.id = job_id RETURNING a.*) INSERT INTO at_jobs_done SELECT *, NULL as start_time, false as status, 'job was canceled' as reason FROM moved_rows;
+		RETURN true;
+	ELSE
+		EXECUTE 'SELECT count(*)  FROM at_jobs_process WHERE owner  = session_user AND id = $1' INTO s_count USING job_id;
+		IF s_count > 0 THEN
+			UPDATE at_jobs_process SET canceled = true WHERE "id" = job_id;
+			RETURN true;
+		END IF;
+	END IF;
+
+	RETURN false;
+END
+$BODY$
+LANGUAGE plpgsql
+   SECURITY DEFINER set search_path FROM CURRENT;
+
+
 CREATE FUNCTION submit_job(
 	query text,
 	params text[] default NULL,
@@ -1283,7 +1309,7 @@ CREATE VIEW job_status AS
 		id, node, name, comments, at as run_after,
 		do_sql as query, params, depends_on, executor as run_as, attempt, 
 		resubmit_limit, postpone as max_wait_interval,
-		max_run_time as max_duration, submit_time,
+		max_run_time as max_duration, submit_time, canceled,
 		start_time, status as is_success, reason as error, done_time,
 		'done'::job_at_status_t status
 	FROM schedule.at_jobs_done where owner = session_user
@@ -1292,7 +1318,7 @@ CREATE VIEW job_status AS
 		id, node, name, comments, at as run_after,
 		do_sql as query, params, depends_on, executor as run_as, attempt, 
 		resubmit_limit, postpone as max_wait_interval,
-		max_run_time as max_duration, submit_time, start_time,
+		max_run_time as max_duration, submit_time, canceled, start_time, 
 		NULL as is_success, NULL as error, NULL as done_time,
 		'processing'::job_at_status_t status
 	FROM ONLY schedule.at_jobs_process where owner = session_user
@@ -1301,7 +1327,7 @@ CREATE VIEW job_status AS
 		id, node, name, comments, at as run_after,
 		do_sql as query, params, depends_on, executor as run_as, attempt, 
 		resubmit_limit, postpone as max_wait_interval,
-		max_run_time as max_duration, submit_time, 
+		max_run_time as max_duration, submit_time, canceled, 
 		NULL as start_time, NULL as is_success, NULL as error,
 		NULL as done_time,
 		'submitted'::job_at_status_t status
diff --git a/src/scheduler_job.c b/src/scheduler_job.c
@@ -167,7 +167,7 @@ job_t *_at_get_jobs_to_do(char *nodename, int *n, int *is_error, int limit)
 	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 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";
+	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 and not canceled order by at,  submit_time limit $2";
 
 	*is_error = *n = 0;
 	START_SPI_SNAP();
@@ -366,9 +366,17 @@ int resubmit_at_job(job_t *j, TimestampTz next)
 	int ret;
 	const char *sql = "WITH moved_rows AS (DELETE from ONLY at_jobs_process a WHERE a.id = $1 RETURNING a.*) INSERT INTO at_jobs_submitted SELECT id, node, name, comments, $2, do_sql, params, depends_on, executor, owner, last_start_available, attempt +1 , resubmit_limit, postpone, max_run_time, submit_time FROM moved_rows";
 
+
 	values[0] = Int32GetDatum(j->cron_id);
 	values[1] = TimestampTzGetDatum(next);
-	ret = SPI_execute_with_args(sql, 2, argtypes, values, NULL, false, 0);
+	if(select_count_with_args("SELECT count(*) FROM at_jobs_process WHERE NOT canceled and id = $1", 1, argtypes, values, NULL))
+	{
+		ret = SPI_execute_with_args(sql, 2, argtypes, values, NULL, false, 0);
+	}
+	else
+	{
+		return -2;
+	}
 
 	return ret > 0 ? 1: ret;
 }
diff --git a/src/scheduler_manager.c b/src/scheduler_manager.c
@@ -1081,7 +1081,11 @@ int scheduler_check_slots(scheduler_manager_ctx_t *ctx, scheduler_manager_pool_t
 				{
 					if(item->job->type == AtJob)
 					{
-						resubmit_at_job(item->job, shm_data->next_time);
+						if(resubmit_at_job(item->job, shm_data->next_time) == -2)
+						{
+							set_job_error(item->job, "was canceled while processing");
+							move_job_to_log(item->job, false, true);
+						}
 					}
 					else
 					{

Original file line number	Diff line number	Diff line change
`@@ -1081,7 +1081,11 @@ int scheduler_check_slots(scheduler_manager_ctx_t *ctx, scheduler_manager_pool_t`
`1081`	`1081`	`{`
`1082`	`1082`	`if(item->job->type == AtJob)`
`1083`	`1083`	`{`
`1084`		`- resubmit_at_job(item->job, shm_data->next_time);`
	`1084`	`+ if(resubmit_at_job(item->job, shm_data->next_time) == -2)`
	`1085`	`+ {`
	`1086`	`+ set_job_error(item->job, "was canceled while processing");`
	`1087`	`+ move_job_to_log(item->job, false, true);`
	`1088`	`+ }`
`1085`	`1089`	`}`
`1086`	`1090`	`else`
`1087`	`1091`	`{`