Merge pull request #3776 from fviale/master

Generic Info REMOVE_DELAY : change format

scheduler/scheduler-server/src/main/java/org/ow2/proactive/scheduler/core/SchedulingService.java

@@ -575,7 +575,6 @@ public class SchedulingService {
         boolean shouldRemoveFromDb = PASchedulerProperties.JOB_REMOVE_FROM_DB.getValueAsBoolean();
 
         if (tempJobs.size() == 1) {
-            logger.info("Job " + jobId + " will be removed at " + new Date(at));
             infrastructure.getDBManager().scheduleJobForRemoval(tempJobs.get(0).getJobInfo().getJobId(),
                                                                 at,
                                                                 shouldRemoveFromDb);
@@ -964,7 +963,7 @@ public class SchedulingService {
             }
             if (jobGenericInfo != null && jobGenericInfo.containsKey(GENERIC_INFO_REMOVE_DELAY)) {
                 try {
-                    removeDelay = Tools.formatDate(jobGenericInfo.get(GENERIC_INFO_REMOVE_DELAY));
+                    removeDelay = Tools.parsePeriod(jobGenericInfo.get(GENERIC_INFO_REMOVE_DELAY));
                 } catch (Exception e) {
                     logger.error("Error when parsing generic information " + GENERIC_INFO_REMOVE_DELAY + " for job " +
                                  jobId, e);
@@ -974,6 +973,7 @@ public class SchedulingService {
             // auto remove
             if (removeDelay < Long.MAX_VALUE) {
                 long timeToRemove = System.currentTimeMillis() + removeDelay;
+                jlogger.info(jobId, "Job " + jobId + " will be removed at " + new Date(timeToRemove));
                 scheduleJobRemove(jobId, timeToRemove);
             }
         } catch (Throwable t) {
@@ -1015,7 +1015,7 @@ public class SchedulingService {
                     if (job.getGenericInformation() != null &&
                         job.getGenericInformation().containsKey(GENERIC_INFO_REMOVE_DELAY)) {
                         try {
-                            toWait = Tools.formatDate(job.getGenericInformation().get(GENERIC_INFO_REMOVE_DELAY));
+                            toWait = Tools.parsePeriod(job.getGenericInformation().get(GENERIC_INFO_REMOVE_DELAY));
                         } catch (Exception e) {
                             logger.error("Error when parsing generic information " + GENERIC_INFO_REMOVE_DELAY +
                                          " for job " + job.getId(), e);

scheduler/scheduler-server/src/test/resources/functionaltests/descriptors/Job_houseKeeping_With_GI.xml

@@ -4,7 +4,7 @@
 	name="Job_houseKeeping_with_GI" priority="normal">
 	<description>Simple Job</description>
 	<genericInformation>
-		<info name="REMOVE_DELAY" value="1:00"/>
+		<info name="REMOVE_DELAY" value="1m"/>
 	</genericInformation>
 	<taskFlow>
 		<task name="task1">