Author: virag
Date: Thu Mar 7 00:48:06 2013
New Revision: 1453632
URL: http://svn.apache.org/r1453632
Log:
OOZIE-1255 latest/future check for hcat can cause shutdown to hang (rohini via
virag)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
oozie/trunk/release-log.txt
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java?rev=1453632&r1=1453631&r2=1453632&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
(original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
Thu Mar 7 00:48:06 2013
@@ -272,6 +272,7 @@ public class CoordELFunctions {
private static String coord_futureRange_sync(int startOffset, int
endOffset, int instance) throws Exception {
final XLog LOG = XLog.getLog(CoordELFunctions.class);
+ final Thread currentThread = Thread.currentThread();
ELEvaluator eval = ELEvaluator.getCurrent();
String retVal = "";
int datasetFrequency = (int) getDSFrequency();// in minutes
@@ -303,7 +304,7 @@ public class CoordELFunctions {
URIHandler uriHandler = null;
Context uriContext = null;
try {
- while (instance >= checkedInstance) {
+ while (instance >= checkedInstance &&
!currentThread.isInterrupted()) {
ELEvaluator uriEval = getUriEvaluator(nominalInstanceCal);
String uriPath = uriEval.evaluate(uriTemplate,
String.class);
if (uriHandler == null) {
@@ -1000,6 +1001,7 @@ public class CoordELFunctions {
private static String coord_latestRange_sync(int startOffset, int
endOffset) throws Exception {
final XLog LOG = XLog.getLog(CoordELFunctions.class);
+ final Thread currentThread = Thread.currentThread();
ELEvaluator eval = ELEvaluator.getCurrent();
String retVal = "";
int datasetFrequency = (int) getDSFrequency();// in minutes
@@ -1035,7 +1037,7 @@ public class CoordELFunctions {
URIHandler uriHandler = null;
Context uriContext = null;
try {
- while (nominalInstanceCal.compareTo(initInstance) >= 0) {
+ while (nominalInstanceCal.compareTo(initInstance) >= 0 &&
!currentThread.isInterrupted()) {
ELEvaluator uriEval = getUriEvaluator(nominalInstanceCal);
String uriPath = uriEval.evaluate(uriTemplate,
String.class);
if (uriHandler == null) {
Modified: oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1453632&r1=1453631&r2=1453632&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Thu Mar 7 00:48:06 2013
@@ -4,6 +4,7 @@ OOZIE-1239 Bump up trunk to 4.1.0-SNAPSH
-- Oozie 4.0.0 (unreleased)
+OOZIE-1255 latest/future check for hcat can cause shutdown to hang (rohini via
virag)
OOZIE-1253 latest() gets resolved before all push dependencies are resolved
(rohini via virag)
OOZIE-1251 Log messages for DependencyChecker class show wrong jobid and
actionid (rohini via mona)
OOZIE-1218 Create a HCatalog Integration Guide (rohini via virag)
