gCubeSystem
/
dataminer-pool-manager
15
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@150856 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Nunzio Andrea Galante 2017-07-06 16:44:03 +00:00
parent 26f7f2d811
commit b8b07462ec
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java
View File

@ -31,9 +31,9 @@ public class DataminerPoolManager {
public String stageAlgorithm(Algorithm algo) throws IOException, InterruptedException { public String stageAlgorithm(Algorithm algo) throws IOException, InterruptedException {
Cluster stagingCluster = ClusterBuilder.getStagingDataminerCluster(); Cluster stagingCluster = ClusterBuilder.getStagingDataminerCluster();
Cluster rProtoCluster = ClusterBuilder.getRProtoCluster(); ***REMOVED***Cluster rProtoCluster = ClusterBuilder.getRProtoCluster();
DMPMJob job = new StagingJob(this.svnUpdater, algo, stagingCluster, rProtoCluster, ScopeProvider.instance.get()); DMPMJob job = new StagingJob(this.svnUpdater, algo, stagingCluster, /*rProtoCluster,*/ ScopeProvider.instance.get());
String id = job.start(); String id = job.start();
return id; return id;
***REMOVED*** ***REMOVED***

6
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/StagingJob.java
View File

@ -19,15 +19,15 @@ public class StagingJob extends DMPMJob {
private Algorithm algorithm; private Algorithm algorithm;
private Cluster stagingCluster; private Cluster stagingCluster;
private Cluster rProtoCluster; ***REMOVED***private Cluster rProtoCluster;
private String rProtoVREName; private String rProtoVREName;
public StagingJob(SVNUpdater svnUpdater, Algorithm algorithm, Cluster stagingCluster, Cluster rProtoCluster, public StagingJob(SVNUpdater svnUpdater, Algorithm algorithm, Cluster stagingCluster, /*Cluster rProtoCluster,*/
String rProtoVREName) { String rProtoVREName) {
super(svnUpdater); super(svnUpdater);
this.algorithm = algorithm; this.algorithm = algorithm;
this.stagingCluster = stagingCluster; this.stagingCluster = stagingCluster;
this.rProtoCluster = rProtoCluster; ***REMOVED***this.rProtoCluster = rProtoCluster;
this.rProtoVREName = rProtoVREName; this.rProtoVREName = rProtoVREName;
***REMOVED*** ***REMOVED***

3
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SendMail.java
View File

@ -18,7 +18,6 @@ import org.gcube.dataanalysis.executor.util.InfraRetrieval;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;
import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiNilLoader.Array;
public class SendMail extends StandardLocalInfraAlgorithm { public class SendMail extends StandardLocalInfraAlgorithm {
@ -45,7 +44,7 @@ public class SendMail extends StandardLocalInfraAlgorithm {
***REMOVED*** put the sender, the recipients, subject and body of the mail here ***REMOVED*** put the sender, the recipients, subject and body of the mail here
subject = URLEncoder.encode(subject, "UTF-8"); subject = URLEncoder.encode(subject, "UTF-8");
body = URLEncoder.encode(body, "UTF-8"); body = URLEncoder.encode(body, "UTF-8");
String requestParameters = "&sender=dataminer&recipients=" + /*this.getAdmins()*/this.username(SecurityTokenProvider.instance.get()) + "&subject=" + subject + "&body=" String requestParameters = "&sender=dataminer&recipients=" + this.getAdmins()/*this.username(SecurityTokenProvider.instance.get())*/ + "&subject=" + subject + "&body="
+ body; + body;
String response = HttpRequest.sendPostRequest(requestForMessage, requestParameters); String response = HttpRequest.sendPostRequest(requestForMessage, requestParameters);

4
src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/JobTest.java
View File

@ -25,8 +25,8 @@ public class JobTest {
***REMOVED***test phase ***REMOVED***test phase
Cluster stagingCluster = ClusterBuilder.getStagingDataminerCluster(); Cluster stagingCluster = ClusterBuilder.getStagingDataminerCluster();
Cluster rProtoCluster = ClusterBuilder.getRProtoCluster(); ***REMOVED***Cluster rProtoCluster = ClusterBuilder.getRProtoCluster();
DMPMJob job = new StagingJob(svnUpdater, algo, stagingCluster, rProtoCluster, ScopeProvider.instance.get()); DMPMJob job = new StagingJob(svnUpdater, algo, stagingCluster, /*rProtoCluster,*/ ScopeProvider.instance.get());
job.start(); job.start();
***REMOVED***release phase ***REMOVED***release phase