From a028b4089f4cd26220bb194f8e31cbf985ed40f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Coll=20Morag=C3=B3n?= Date: Wed, 16 Oct 2024 16:01:13 +0100 Subject: [PATCH] master: Fix conflicts. #TASK-6219 --- .../opencga/core/models/variant/OperationIndexStatus.java | 2 +- .../opencga/master/monitor/daemons/MonitorParentDaemon.java | 4 ++++ .../master/monitor/daemons/VariantOperationJanitor.java | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/opencga-core/src/main/java/org/opencb/opencga/core/models/variant/OperationIndexStatus.java b/opencga-core/src/main/java/org/opencb/opencga/core/models/variant/OperationIndexStatus.java index b10b66ae9b..edb71cbd5c 100644 --- a/opencga-core/src/main/java/org/opencb/opencga/core/models/variant/OperationIndexStatus.java +++ b/opencga-core/src/main/java/org/opencb/opencga/core/models/variant/OperationIndexStatus.java @@ -14,7 +14,7 @@ public class OperationIndexStatus extends IndexStatus { public OperationIndexStatus(String status, String message) { if (isValid(status)) { - init(status, status, message); + init(status, message); } else { throw new IllegalArgumentException("Unknown status " + status); } 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 960e3404b3..60f55618aa 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 @@ -90,4 +90,8 @@ public void init() throws Exception { } public 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 f1b4ce5383..6bdb504fca 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), attributes, token); + Collections.singletonList(TAG), null, null, null, 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), attributes, token); + Collections.singletonList(TAG), null, null, null, attributes, token); } }