From ff84a0f9d32f33b6dfa9a7c54cd0b533625999f8 Mon Sep 17 00:00:00 2001 From: Gianpaolo Coro Date: Mon, 1 Feb 2016 22:08:46 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/EcologicalEngineSmartExecutor@122706 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../executor/job/management/QueueJobManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/dataanalysis/executor/job/management/QueueJobManager.java b/src/main/java/org/gcube/dataanalysis/executor/job/management/QueueJobManager.java index 173fcb0..dc78946 100644 --- a/src/main/java/org/gcube/dataanalysis/executor/job/management/QueueJobManager.java +++ b/src/main/java/org/gcube/dataanalysis/executor/job/management/QueueJobManager.java @@ -193,13 +193,15 @@ public class QueueJobManager { findNodes(scope); } - public QueueJobManager(String scope, int numberOfNodes) throws Exception { + public QueueJobManager(String scope, int numberOfNodes, String session) throws Exception { init(scope, numberOfNodes); + this.session = session; } - public QueueJobManager(String scope, int numberOfNodes, List eprs) throws Exception { + public QueueJobManager(String scope, int numberOfNodes, List eprs, String session) throws Exception { init(scope, numberOfNodes); this.eprs = eprs; + this.session = session; } private void setGlobalVars(String serviceClass, String serviceName, String owner, String localDir, String remoteDir, String outputDir, String script, List arguments, String configuration, boolean deletefiles) { @@ -224,7 +226,8 @@ public class QueueJobManager { /*generic-worker * int div = elements / (maxNumberOfMessages); int rest = elements % (maxNumberOfMessages); if (rest > 0) div++; if (div == 0) { div = 1; } */ - session = (("" + UUID.randomUUID()).replace("-", "") + Math.random()).replace(".", ""); + if (session == null || session.length()==0) + session = (("" + UUID.randomUUID()).replace("-", "") + Math.random()).replace(".", ""); int[] chunkSizes = null; //up to 1120 species we don't make stages if (elements>maxNumberOfStages)