diff --git a/opencga-master/src/main/java/org/opencb/opencga/master/monitor/daemons/ExecutionDaemon.java b/opencga-master/src/main/java/org/opencb/opencga/master/monitor/daemons/ExecutionDaemon.java index 7a88216dce..e034d591b5 100644 --- a/opencga-master/src/main/java/org/opencb/opencga/master/monitor/daemons/ExecutionDaemon.java +++ b/opencga-master/src/main/java/org/opencb/opencga/master/monitor/daemons/ExecutionDaemon.java @@ -290,11 +290,10 @@ public MonitorParentDaemon setBatchExecutor(BatchExecutor batchExecutor) { } @Override - public void apply() throws Exception { + protected void apply() throws Exception { checkJobs(); } - @Override public void close() throws IOException { batchExecutor.close(); diff --git a/opencga-master/src/main/java/org/opencb/opencga/master/monitor/daemons/MonitorParentDaemon.java b/opencga-master/src/main/java/org/opencb/opencga/master/monitor/daemons/MonitorParentDaemon.java index 60f55618aa..15c7389e5b 100644 --- a/opencga-master/src/main/java/org/opencb/opencga/master/monitor/daemons/MonitorParentDaemon.java +++ b/opencga-master/src/main/java/org/opencb/opencga/master/monitor/daemons/MonitorParentDaemon.java @@ -89,7 +89,7 @@ public void init() throws Exception { } - public abstract void apply() throws Exception; + protected abstract void apply() throws Exception; @Override public void close() throws IOException { diff --git a/opencga-master/src/main/java/org/opencb/opencga/master/monitor/daemons/VariantOperationJanitor.java b/opencga-master/src/main/java/org/opencb/opencga/master/monitor/daemons/VariantOperationJanitor.java index 6bdb504fca..7cdb7981ad 100644 --- a/opencga-master/src/main/java/org/opencb/opencga/master/monitor/daemons/VariantOperationJanitor.java +++ b/opencga-master/src/main/java/org/opencb/opencga/master/monitor/daemons/VariantOperationJanitor.java @@ -170,7 +170,7 @@ private void checkPendingChore(OperationChore operationChore, Project project) t paramsMap.put(ParamConstants.PROJECT_PARAM, project.getFqn()); catalogManager.getJobManager().submit(studyFqns.get(0), toolId, Enums.Priority.HIGH, paramsMap, null, generateJobDescription(config, operationChore, attributes), null, - Collections.singletonList(TAG), null, null, null, attributes, token); + Collections.singletonList(TAG), null, null, false, attributes, token); } } @@ -206,7 +206,7 @@ private void checkPendingChore(OperationChore operationChore, Project project, S paramsMap.put(ParamConstants.STUDY_PARAM, study.getFqn()); catalogManager.getJobManager().submit(study.getFqn(), toolId, Enums.Priority.HIGH, paramsMap, null, generateJobDescription(config, operationChore, attributes), null, - Collections.singletonList(TAG), null, null, null, attributes, token); + Collections.singletonList(TAG), null, null, false, attributes, token); } }