Merge commit '3e1c82d97d03ef698a9fc500c6da38b7185206d2' into PGPROEE10_scheduler

Author: Vladimir Ershov

contrib/pgpro_scheduler/pgpro_scheduler--2.2.sql

@@ -321,12 +321,12 @@ CREATE FUNCTION version()
 CREATE FUNCTION get_self_id()
   RETURNS bigint 
   AS 'MODULE_PATHNAME', 'get_self_id'
-  LANGUAGE C IMMUTABLE;
+  LANGUAGE C VOLATILE;
 
 CREATE FUNCTION resubmit(run_after interval default NULL)
   RETURNS bigint 
   AS 'MODULE_PATHNAME', 'resubmit'
-  LANGUAGE C IMMUTABLE;
+  LANGUAGE C VOLATILE;
 
 CREATE FUNCTION cancel_job(job_id bigint)  RETURNS boolean AS
 $BODY$

contrib/pgpro_scheduler/src/scheduler_executor.c

@@ -796,8 +796,6 @@ int process_one_job(schd_executor_share_state_t *shared, schd_executor_status_t
 
 	scheduler_atjob_id_OID = get_atttype(subm_rel_oid, 1);
 
-
-
 	job = get_at_job_for_process(mem, shared->nodename, &error);
 	if(!job)
 	{
@@ -807,10 +805,16 @@ int process_one_job(schd_executor_share_state_t *shared, schd_executor_status_t
 			elog(LOG, "AT EXECUTOR ERROR: get job: %s", error);
 			pfree(error);
 			ABORT_SPI_SNAP();
+			MemoryContextSwitchTo(old);
+			MemoryContextDelete(mem);
+
 			return -1;
 		}
 		STOP_SPI_SNAP();
 		shared->status = SchdExecutorIdling;
+		MemoryContextSwitchTo(old);
+		MemoryContextDelete(mem);
+
 		return 0;
 	}
 	if(scheduler_atjob_id_OID != INT8OID)
@@ -843,6 +847,8 @@ int process_one_job(schd_executor_share_state_t *shared, schd_executor_status_t
 		{
 			elog(LOG, "AT-EXECUTOR ERROR: move after auth: %s", set_error);
 			ABORT_SPI_SNAP();
+			MemoryContextSwitchTo(old);
+			MemoryContextDelete(mem);
 			return -1;
 		}
 		STOP_SPI_SNAP();

contrib/pgpro_scheduler/src/scheduler_job.c

@@ -641,7 +641,6 @@ int set_at_job_done(job_t *job, char *error, int64 resubmit, char **set_error)
 			values[4] = TimestampTzGetDatum(timestamp_add_seconds(0, resubmit));
 			values[11] = Int64GetDatum(job->attempt + 1);
 			n = 17;
-			elog(LOG, "resubmit job %ld, %d", resubmit, job->attempt + 1);
 		}
 		else
 		{