Merge branch 'TASK-6219' of github.com:opencb/opencga into TASK-6219

opencb · Oct 16, 2024 · ced9545 · ced9545
2 parents a028b40 + 9e1ef85
commit ced9545
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
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
@@ -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/...a-master/src/main/java/org/opencb/opencga/master/monitor/daemons/MonitorParentDaemon.java b/...a-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/...ster/src/main/java/org/opencb/opencga/master/monitor/daemons/VariantOperationJanitor.java b/...ster/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);
         }
     }