From 7c3441a52268c31bf22d0d9962da24286fcffcf4 Mon Sep 17 00:00:00 2001
From: Adriaan Renting <renting@astron.nl>
Date: Wed, 29 Jun 2016 13:55:00 +0000
Subject: [PATCH] Task #9599: Changed scheduler to not set input files for CEP4
and ignore pipelines managed by SLURM with a start time in the past.
---
SAS/Scheduler/src/Controller.cpp | 3 +++
SAS/Scheduler/src/SASConnection.cpp | 3 +++
2 files changed, 6 insertions(+)
diff --git a/SAS/Scheduler/src/Controller.cpp b/SAS/Scheduler/src/Controller.cpp
index 504b8b04a40..2342513510d 100644
--- a/SAS/Scheduler/src/Controller.cpp
+++ b/SAS/Scheduler/src/Controller.cpp
@@ -4544,6 +4544,9 @@ bool Controller::checkEarlyTasksStatus(void) {
int treeID;
for (std::vector<Task *>::const_iterator it = tasks.begin(); it != tasks.end(); ++it) {
if ((*it)->getScheduledStart() <= now()) {
+ if (((*it)->getOutputDataproductCluster() == "CEP4") && (*it)->isPipeline()) {
+ continue; //Pipelines on CEP4: we don't care as SLURM sorts it out.
+ }
treeID = (*it)->getSASTreeID();
if ((itsSASConnection->connect() == 0) && (treeID != 0)) { // only do the sas check for apparently too early tasks that are already in SAS , not for new tasks
Task::task_status status(itsSASConnection->getTaskStatus(treeID));
diff --git a/SAS/Scheduler/src/SASConnection.cpp b/SAS/Scheduler/src/SASConnection.cpp
index c33f4dd2729..66edc07fc54 100644
--- a/SAS/Scheduler/src/SASConnection.cpp
+++ b/SAS/Scheduler/src/SASConnection.cpp
@@ -2576,6 +2576,9 @@ bool SASConnection::saveStationSettings(int treeID, const StationTask &task, con
bool SASConnection::saveInputStorageSettings(int treeID, const Task &task) {
bool bResult(true);
+ if (task.getOutputDataproductCluster() == "CEP4") { //For CEP4 we're skipping this. /AR
+ return bResult;
+ }
const TaskStorage *task_storage(task.storage());
if (task_storage) {
const std::map<dataProductTypes, TaskStorage::inputDataProduct> &inputDataProducts(task_storage->getInputDataProducts());
--
GitLab