vanish at works

Vladimir Ershov · Vladimir Ershov · commit 2f160bf4877f · 2017-02-10T17:19:56.000+03:00
diff --git a/pgpro_scheduler--2.0.sql b/pgpro_scheduler--2.0.sql
@@ -192,7 +192,7 @@ BEGIN
 			USING HINT = 'you cannot use ''run_after'' and ''depends_on'' parameters at the same time';
 	END IF;
 
-	IF max_wait_interval IS NOT NULL AND run_after IS NULL THEN
+	IF max_wait_interval IS NOT NULL AND run_after IS NOT NULL THEN
 		last_avail := run_after + max_wait_interval;
 	ELSE
 		last_avail := NULL;
diff --git a/src/scheduler_manager.c b/src/scheduler_manager.c
@@ -1177,8 +1177,13 @@ int scheduler_vanish_expired_jobs(scheduler_manager_ctx_t *ctx, task_type_t type
 	int move_ret;
 	char *ts;
 	bool ts_hires = false;
+	TimestampTz *check_time;
+	int interval;
+
+	check_time = type == CronJob ? &(ctx->next_expire_time): &(ctx->next_at_expire_time);
+	interval = type == CronJob ? 30: 25;
 
-	if(ctx->next_expire_time > GetCurrentTimestamp()) return -1;
+	if(*check_time > GetCurrentTimestamp()) return -1;
 	pgstat_report_activity(STATE_RUNNING, "vanish expired tasks");
 	START_SPI_SNAP();
 	expired = type == CronJob ? 
@@ -1227,7 +1232,7 @@ int scheduler_vanish_expired_jobs(scheduler_manager_ctx_t *ctx, task_type_t type
 		ret = 0;
 	}
 	STOP_SPI_SNAP();
-	ctx->next_expire_time = timestamp_add_seconds(0, 30);
+	*check_time = timestamp_add_seconds(0, interval);
 	pgstat_report_activity(STATE_IDLE, "vanish expired tasks done");
 
 	return ret;
