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@151268 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Nunzio Andrea Galante 2017-07-25 13:51:25 +00:00
parent 83fcaf3808
commit 85c51c1f9a
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/ProductionPublishingJob.java
View File

@ -45,9 +45,11 @@ public class ProductionPublishingJob extends DMPMJob {
this.svnUpdater.updateSVNProdAlgorithmList(this.algorithm, this.targetVREName, this.algorithm.getFullname(), "Prod"); this.svnUpdater.updateSVNProdAlgorithmList(this.algorithm, this.targetVREName, this.algorithm.getFullname(), "Prod");
this.getStatus(9); this.getStatus(9);
sm.sendNotification(nh.getSuccessSubjectRelease() + " for "+this.algorithm.getName()+ " algorithm", nh.getSuccessBodyRelease(this.buildInfo())); sm.sendNotification(nh.getSuccessSubjectRelease() + " for "+this.algorithm.getName()+ " algorithm", nh.getSuccessBodyRelease(this.buildInfo()));
return;
***REMOVED*** ***REMOVED***
else this.getStatus(0);
sm.sendNotification(nh.getFailedSubjectRelease() + " for "+this.algorithm.getName()+ " algorithm", nh.getFailedBodyRelease(this.buildInfo()+" The user "+this.algorithm.getFullname()+ " is not authorized to access to the "+ targetVREName+ " VRE"));
return;
***REMOVED*** int ret = this.executeAnsibleWorker( ***REMOVED*** int ret = this.executeAnsibleWorker(
***REMOVED*** createWorker(this.algorithm, this.prodCluster, false, "gcube")); ***REMOVED*** createWorker(this.algorithm, this.prodCluster, false, "gcube"));
@ -59,7 +61,7 @@ public class ProductionPublishingJob extends DMPMJob {
public String getStatus(int exitstatus) throws FileNotFoundException, UnsupportedEncodingException { public String getStatus(int exitstatus) throws FileNotFoundException, UnsupportedEncodingException {
File m = new File(this.jobLogs + File.separator + this.id); File m = new File(this.jobLogs + File.separator + this.id+"_exitStatus");
PrintWriter writer = new PrintWriter(m, "UTF-8"); PrintWriter writer = new PrintWriter(m, "UTF-8");
String response = ""; String response = "";
@ -68,6 +70,14 @@ public class ProductionPublishingJob extends DMPMJob {
response = "SVN REPOSITORY CORRECTLY UPDATED; THE CRON JOB WILL INSTALL THE ALGORITHM "+ this.algorithm.getName() + " IN THE VRE" + targetVREName; response = "SVN REPOSITORY CORRECTLY UPDATED; THE CRON JOB WILL INSTALL THE ALGORITHM "+ this.algorithm.getName() + " IN THE VRE" + targetVREName;
writer.println(response); writer.println(response);
***REMOVED*** ***REMOVED***
if (exitstatus == 0) {
response = "SVN REPOSITORY UPDATE FAI; THE CRON JOB WILL NOT BE ABLE TO INSTALL THE ALGORITHM "+this.algorithm.getName()+" IN THE VRE" + targetVREName;;
writer.println(response);
***REMOVED***writer.close();
***REMOVED***
writer.close(); writer.close();
return response; return response;
***REMOVED*** ***REMOVED***

6
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/NotificationHelper.java
View File

@ -66,6 +66,12 @@ public class NotificationHelper {
return message; return message;
***REMOVED*** ***REMOVED***
public String getFailedBodyRelease(String info) {
String message = String.format("SVN REPOSITORY UPDATE FAILED.");
message+="\n\n The CRON job will NOT be able to install the algorithm in the target VRE \n\n"+ info;
return message;
***REMOVED***
***REMOVED*** public String getSubject() { ***REMOVED*** public String getSubject() {
***REMOVED*** if(this.isError()) { ***REMOVED*** if(this.isError()) {
***REMOVED*** return this.getFailedSubject(); ***REMOVED*** return this.getFailedSubject();