Commit 0d412d04 authored by Marta Bertran Ferrer's avatar Marta Bertran Ferrer
Browse files

Solved conflicts

parents a7c66477 74277683
...@@ -491,7 +491,7 @@ public class JobAgent implements Runnable { ...@@ -491,7 +491,7 @@ public class JobAgent implements Runnable {
} }
setStatus(jaStatus.FINISHING_JA); setStatus(jaStatus.FINISHING_JA);
monitor.setMonitoring("resource_status", null); monitor.setMonitoring("resource_status", null);
logger.log(Level.INFO, "JobAgent finished, id: " + jobAgentId + " totalJobs: " + totalJobs.get()); logger.log(Level.INFO, "JobAgent finished, id: " + jobAgentId + " totalJobs: " + totalJobs.get());
...@@ -537,7 +537,6 @@ public class JobAgent implements Runnable { ...@@ -537,7 +537,6 @@ public class JobAgent implements Runnable {
setStatus(jaStatus.DONE); setStatus(jaStatus.DONE);
setUsedCores(0); setUsedCores(0);
reqCPU = Long.valueOf(0);
monitor.sendParameter("job_id", Integer.valueOf(0)); monitor.sendParameter("job_id", Integer.valueOf(0));
...@@ -852,7 +851,6 @@ public class JobAgent implements Runnable { ...@@ -852,7 +851,6 @@ public class JobAgent implements Runnable {
setStatus(jaStatus.ERROR_START); setStatus(jaStatus.ERROR_START);
setUsedCores(0); setUsedCores(0);
reqCPU = Long.valueOf(0);
return 1; return 1;
} }
...@@ -1107,7 +1105,6 @@ public class JobAgent implements Runnable { ...@@ -1107,7 +1105,6 @@ public class JobAgent implements Runnable {
setStatus(jaStatus.ERROR_DIRS); setStatus(jaStatus.ERROR_DIRS);
setUsedCores(0); setUsedCores(0);
reqCPU = Long.valueOf(0);
return false; return false;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment