Author: burn
Date: Fri May 20 14:30:00 2016
New Revision: 1744750
URL: http://svn.apache.org/viewvc?rev=1744750&view=rev
Log:
UIMA-4922 Improve misconfigured error msg by logging the cause(s) on separate
lines
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java?rev=1744750&r1=1744749&r2=1744750&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
Fri May 20 14:30:00 2016
@@ -196,7 +196,7 @@ public class DuccJobSubmit
scheduling_class =
duccSchedulerClasses.getDebugClassDefaultName();
}
} catch (Exception e) {
- throw new IllegalConfigurationException("Error in DUCC
configuration files - administrator error: " + e);
+ throw new IllegalConfigurationException("Error in DUCC
configuration files - see administrator", e);
}
if (scheduling_class != null) {
props.setProperty(pname, scheduling_class);
@@ -291,6 +291,13 @@ public class DuccJobSubmit
enrich_parameters_for_debug(jobRequestProperties);
} catch (Exception e1) {
message(e1.toString());
+ Throwable t = e1;
+ while ((t = t.getCause()) != null) {
+ message(" ... " + t);
+ }
+ if (jobRequestProperties.containsKey(UiOption.Debug.pname())) {
+ e1.printStackTrace();
+ }
return false;
}
@@ -384,8 +391,15 @@ public class DuccJobSubmit
}
catch(Throwable e) {
System.out.println("Cannot initialize: " + e);
- if (!(e instanceof IllegalArgumentException)) {
- e.printStackTrace();
+ Throwable t = e;
+ while ((t = t.getCause()) != null) {
+ System.out.println(" ... " + t);
+ }
+ for (String arg : args) {
+ if (arg.equals("--debug")) {
+ e.printStackTrace();
+ break;
+ }
}
System.exit(1);
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java?rev=1744750&r1=1744749&r2=1744750&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java
Fri May 20 14:30:00 2016
@@ -164,7 +164,7 @@ public class DuccManagedReservationSubmi
}
}
} catch (Exception e) {
- throw new IllegalConfigurationException("Error in DUCC
configuration files - administrator error: " + e);
+ throw new IllegalConfigurationException("Error in DUCC
configuration files - see administrator", e);
}
}
@@ -222,7 +222,16 @@ public class DuccManagedReservationSubmi
}
} catch (Throwable e) {
System.out.println(dt+" Cannot initialize: " + e);
- //e.printStackTrace();
+ Throwable t = e;
+ while ((t = t.getCause()) != null) {
+ System.out.println(" ... " + t);
+ }
+ for (String arg : args) {
+ if (arg.equals("--debug")) {
+ e.printStackTrace();
+ break;
+ }
+ }
} finally {
// Set the process exit code
System.exit(code);
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java?rev=1744750&r1=1744749&r2=1744750&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java
Fri May 20 14:30:00 2016
@@ -101,14 +101,15 @@ public class DuccReservationSubmit
String pname = UiOption.SchedulingClass.pname();
String scheduling_class = requestProperties.getProperty(pname);
if (scheduling_class != null) {
- try {
- String[] reserveClasses =
DuccSchedulerClasses.getInstance().getReserveClasses();
+ String[] reserveClasses;
+ try {
+ reserveClasses =
DuccSchedulerClasses.getInstance().getReserveClasses();
+ } catch (Exception e) {
+ throw new IllegalConfigurationException("Error in DUCC
configuration files - see administrator", e);
+ }
if (!Arrays.asList(reserveClasses).contains(scheduling_class)) {
- throw new IllegalArgumentException("Invalid value for
scheduling_class - must be one of the reserve classes");
+ throw new IllegalArgumentException("Invalid value for
scheduling_class - must be one of the reserve classes");
}
- } catch (Exception e) {
- throw new IllegalConfigurationException("Error in DUCC
configuration files - administrator error: " + e);
- }
}
SubmitReservationDuccEvent ev = new
SubmitReservationDuccEvent(requestProperties, CliVersion.getVersion());
SubmitReservationReplyDuccEvent reply = null;
@@ -200,6 +201,9 @@ public class DuccReservationSubmit
}
} catch (Throwable e) {
System.out.println("Cannot initialize: " + e);
+ while ((e = e.getCause()) != null) {
+ System.out.println(" ... " + e);
+ }
} finally {
// Set the process exit code
System.exit(code);
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java?rev=1744750&r1=1744749&r2=1744750&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
Fri May 20 14:30:00 2016
@@ -440,17 +440,19 @@ public class DuccServiceApi
// Check if falsely using a fair-share class; set the default if
missing
String scheduling_class =
cli_props.getProperty(UiOption.SchedulingClass.pname());
+ boolean isPreemptableClass = false;
try {
DuccSchedulerClasses duccSchedulerClasses =
DuccSchedulerClasses.getInstance();
if (scheduling_class != null) {
- if (duccSchedulerClasses.isPreemptable(scheduling_class)) {
- throw new IllegalArgumentException("Invalid pre-emptable
scheduling class: " + scheduling_class);
- }
+ isPreemptableClass =
duccSchedulerClasses.isPreemptable(scheduling_class);
} else {
cli_props.setProperty(UiOption.SchedulingClass.pname(),
duccSchedulerClasses.getDebugClassDefaultName());
}
} catch (Exception e) {
- throw new IllegalConfigurationException("Error in DUCC
configuration files - administrator error: " + e);
+ throw new IllegalConfigurationException("Error in DUCC
configuration files - see administrator", e);
+ }
+ if (isPreemptableClass) {
+ throw new IllegalArgumentException("Invalid pre-emptable
scheduling class: " + scheduling_class);
}
// work out stuff I'm dependent upon
@@ -1046,6 +1048,10 @@ public class DuccServiceApi
}
} catch (Throwable e) {
System.out.println("Service call failed: " + e);
+ Throwable t = e;
+ while ((t = t.getCause()) != null) {
+ System.out.println(" ... " + t);
+ }
for (String arg : args) {
if (arg.equals("--debug")) {
e.printStackTrace();
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java?rev=1744750&r1=1744749&r2=1744750&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java
Fri May 20 14:30:00 2016
@@ -379,7 +379,7 @@ public class AllInOneLauncher extends Cl
}
used(pname);
} catch (Exception e) {
- throw new IllegalConfigurationException("Error in DUCC
configuration files - administrator error: " + e);
+ throw new IllegalConfigurationException("Error in DUCC
configuration files - see administrator", e);
}
}
mh.frameworkTrace(cid, mid, exit);
