[Swift-commit] cog r3851

[swift at ci.uchicago.edu]

------------------------------------------------------------------------
r3851 | davidkelly999 | 2013-12-06 20:49:23 -0600 (Fri, 06 Dec 2013) | 5 lines

When a scheduler script submission fails, for example from an incorrect project name, a TaskSubmissionException is generated,
but execution continues forever without completing and the user is not notified of the error. 
TaskSubmissionExceptions will now result in calling taskFailed() on the coaster block
Added some modifications to log levels and formatting to generate a clear message to the user

------------------------------------------------------------------------
Index: modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/common/AbstractJobSubmissionTaskHandler.java
===================================================================
--- modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/common/AbstractJobSubmissionTaskHandler.java	(revision 3850)
+++ modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/common/AbstractJobSubmissionTaskHandler.java	(working copy)
@@ -60,8 +60,7 @@
 		}
 		catch (Exception e) {
 			if (e.getMessage() != null) {
-				throw new TaskSubmissionException("Cannot submit job: "
-						+ e.getMessage(), e);
+				throw new TaskSubmissionException(e.getMessage(), e);
 			}
 			else {
 				throw new TaskSubmissionException("Cannot submit job", e);
Index: modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/BlockTaskSubmitter.java
===================================================================
--- modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/BlockTaskSubmitter.java	(revision 3850)
+++ modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/BlockTaskSubmitter.java	(working copy)
@@ -72,7 +72,8 @@
                 }
                 catch (TaskSubmissionException e) {
                     if (b.getTask().getStatus().getStatusCode() != Status.CANCELED) {
-                        logger.info("Error submitting block task", e);
+                        logger.error("\n" + e.getMessage().trim());
+                        b.taskFailed("Error submitting block task", e);
                     }
                     else {
                         logger.info("Block task was canceled previously: " + b);
@@ -94,4 +95,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
Index: modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/Block.java
===================================================================
--- modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/Block.java	(revision 3850)
+++ modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/Block.java	(working copy)
@@ -342,7 +342,7 @@
                     getSubmitter().cancel(this);
                 }
                 catch (Exception e) {
-                    logger.warn("Failed to shut down block: " + this, e);
+                    logger.debug("Failed to shut down block: " + this, e);
                 }
                 bqp.blockTaskFinished(this);
             }