gCubeSystem
/
smart-executor
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed log and accounting 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/vre-management/smart-executor@152803 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2017-09-06 15:37:57 +00:00
parent 7c90dfa561
commit c78a908481
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.settings/org.eclipse.wst.common.project.facet.core.xml
View File

@ -1,8 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="wst.jsdt.web"/>
<installed facet="java" version="1.7"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="jst.jaxrs" version="2.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="java" version="1.8"/>
</faceted-project>

2
pom.xml
View File

@ -10,7 +10,7 @@
<groupId>org.gcube.vremanagement</groupId>
<artifactId>smart-executor</artifactId>
<version>1.6.0-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<name>SmartExecutor</name>
<description>Smart Executor Service</description>
<packaging>war</packaging>

5
src/main/java/org/gcube/vremanagement/executor/pluginmanager/RunnablePlugin.java
View File

@ -3,9 +3,7 @@
*/
package org.gcube.vremanagement.executor.pluginmanager;
import java.io.Serializable;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@ -112,6 +110,7 @@ public class RunnablePlugin<T extends Plugin<? extends PluginDeclaration>> imple
taskUsageRecord.setRefHostingNodeId(hnRef.getId());
taskUsageRecord.setHost(hnRef.getAddress());
/*
if(inputs!=null && inputs.size()>0){
HashMap<String, Serializable> map =
new HashMap<String, Serializable>();
@ -122,7 +121,7 @@ public class RunnablePlugin<T extends Plugin<? extends PluginDeclaration>> imple
}
taskUsageRecord.setInputParameters(map);
}
*/
this.plugin.setUUID(uuid);
this.plugin.setIterationNumber(iterationNumber);

4
src/main/java/org/gcube/vremanagement/executor/scheduler/SmartExecutorScheduler.java
View File

@ -122,7 +122,7 @@ public class SmartExecutorScheduler {
if (scheduling != null) {
try {
logger.info("Going to schedule Taks with UUID with the following {} : {}", uuid, LaunchParameter.class.getSimpleName(), ObjectMapperManager.getObjectMapper().writeValueAsString(parameter));
logger.info("Going to schedule Taks with UUID {} with the following {} : {}", uuid, LaunchParameter.class.getSimpleName(), ObjectMapperManager.getObjectMapper().writeValueAsString(parameter));
} catch (Exception e) {
}
@ -149,7 +149,7 @@ public class SmartExecutorScheduler {
try {
ScheduledTaskPersistence stc = ScheduledTaskPersistenceFactory.getScheduledTaskPersistence();
ScheduledTask scheduledTask = new ScheduledTask(uuid, parameter);
logger.debug("Going to persist Scheduled Task {} : {} ",
logger.debug("Going to persist Scheduled Task {} ",
scheduledTask);
stc.addScheduledTask(scheduledTask);
} catch (Exception e) {