Changeset 1162 for DCWoRMS/branches/coolemall/src/schedframe

Timestamp:

08/01/13 11:02:08 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy/local/LocalManagementSystem.java (modified) (4 diffs)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy/local/LocalManagementSystem.java

@@ -147 +147 @@
                         if(!job.isFinished()){
                                 getWorkloadUnitHandler().handleJob(job);
-                        }
+                        } 
+                        //SUPPORTS PRECEDING CONSTRAINST COMING BOTH FROM SWF FILES
+                        /*else {
+                                try {
+                                        job.setStatus((int)BrokerConstants.JOB_STATUS_FINISHED);
+                                } catch (Exception e) {
+
+                                }
+                                for(JobInterface<?> j: jobRegistry.getJobs((int)BrokerConstants.JOB_STATUS_SUBMITTED)){
+                                        getWorkloadUnitHandler().handleJob(j);  
+                                }
+                        }*/
                         break;
                         
@@ -260 +271 @@
         }
         
-        public void finalizeExecutable(ExecTask execTask){
+        protected void finalizeExecutable(ExecTask execTask){
                 
                 Executable exec = (Executable)execTask;
@@ -506 +517 @@
         public void notifySubmittedWorkloadUnit(WorkloadUnit wu, boolean ack) {
                 updateProcessingProgress();
+                if (log.isInfoEnabled())
+                        log.info("Received job " + wu.getId() + " at " + new DateTime(DateTimeUtilsExt.currentTimeMillis()));
                 registerWorkloadUnit(wu);
         }
@@ -521 +534 @@
 
                         if (log.isInfoEnabled())
-                                log.info("Received job " + job.getId() + " at " + new DateTime(DateTimeUtilsExt.currentTimeMillis()));
-
+                                log.info("Handle " + job.getId() + " at " + new DateTime(DateTimeUtilsExt.currentTimeMillis()));
+                        
+                        try {
+                                if(job.getStatus() == BrokerConstants.JOB_STATUS_UNSUBMITTED)
+                                        job.setStatus((int)BrokerConstants.JOB_STATUS_SUBMITTED);
+                        } catch (Exception e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
                         List<JobInterface<?>> jobsList = new ArrayList<JobInterface<?>>();
                         jobsList.add(job);