[Cogkit-svn] SF.net SVN: cogkit: [1894] trunk/current/src/cog/modules/ provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler

[<ha...@us...>]

Revision: 1894
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1894&view=rev
Author:   hategan
Date:     2008-02-12 09:32:32 -0800 (Tue, 12 Feb 2008)

Log Message:
-----------
fixed some weirdness with the handlers

Modified Paths:
--------------
    trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/execution/JobSubmissionTaskHandler.java
    trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/pbs/execution/JobSubmissionTaskHandler.java

Modified: trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/execution/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/execution/JobSubmissionTaskHandler.java	2008-02-12 17:32:00 UTC (rev 1893)
+++ trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/execution/JobSubmissionTaskHandler.java	2008-02-12 17:32:32 UTC (rev 1894)
@@ -41,6 +41,7 @@
         }
         else {
             this.task = task;
+            task.setStatus(Status.SUBMITTING);
             try {
                 spec = (JobSpecification) this.task.getSpecification();
             }
@@ -57,13 +58,15 @@
             }
 
             try {
-                new CobaltExecutor(task, this).start();
-                // check if the task has not been canceled after it was
-                // submitted for execution
-                if (this.task.getStatus().getStatusCode() == Status.UNSUBMITTED) {
-                    this.task.setStatus(Status.SUBMITTED);
-                    if (spec.isBatchJob()) {
-                        this.task.setStatus(Status.COMPLETED);
+                synchronized(this) {                    
+                    // check if the task has not been canceled after it was
+                    // submitted for execution
+                    if (this.task.getStatus().getStatusCode() != Status.CANCELED) {
+                        new CobaltExecutor(task, this).start();
+                        this.task.setStatus(Status.SUBMITTED);
+                        if (spec.isBatchJob()) {
+                            this.task.setStatus(Status.COMPLETED);
+                        }
                     }
                 }
             }
@@ -87,8 +90,9 @@
             TaskSubmissionException {
     }
 
-    public void cancel() throws InvalidSecurityContextException,
+    public synchronized void cancel() throws InvalidSecurityContextException,
             TaskSubmissionException {
+        //TODO qdel?
         this.task.setStatus(Status.CANCELED);
     }
 

Modified: trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/pbs/execution/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/pbs/execution/JobSubmissionTaskHandler.java	2008-02-12 17:32:00 UTC (rev 1893)
+++ trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/pbs/execution/JobSubmissionTaskHandler.java	2008-02-12 17:32:32 UTC (rev 1894)
@@ -41,6 +41,7 @@
         }
         else {
             this.task = task;
+            task.setStatus(Status.SUBMITTING);
             try {
                 spec = (JobSpecification) this.task.getSpecification();
             }
@@ -57,13 +58,13 @@
             }
 
             try {
-                new PBSExecutor(task, this).start();
-                // check if the task has not been canceled after it was
-                // submitted for execution
-                if (this.task.getStatus().getStatusCode() == Status.UNSUBMITTED) {
-                    this.task.setStatus(Status.SUBMITTED);
-                    if (spec.isBatchJob()) {
-                        this.task.setStatus(Status.COMPLETED);
+                synchronized(this) {
+                    if (this.task.getStatus().getStatusCode() != Status.CANCELED) {
+                        new PBSExecutor(task, this).start();
+                        this.task.setStatus(Status.SUBMITTED);
+                        if (spec.isBatchJob()) {
+                            this.task.setStatus(Status.COMPLETED);
+                        }
                     }
                 }
             }
@@ -87,8 +88,9 @@
             TaskSubmissionException {
     }
 
-    public void cancel() throws InvalidSecurityContextException,
+    public synchronized void cancel() throws InvalidSecurityContextException,
             TaskSubmissionException {
+        //TODO actually cancel the job
         this.task.setStatus(Status.CANCELED);
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.