You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by vi...@apache.org on 2013/03/07 01:48:37 UTC
svn commit: r1453633 - in /oozie/branches/branch-4.0:
core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
release-log.txt
Author: virag
Date: Thu Mar 7 00:48:37 2013
New Revision: 1453633
URL: http://svn.apache.org/r1453633
Log:
OOZIE-1255 latest/future check for hcat can cause shutdown to hang (rohini via virag)
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
oozie/branches/branch-4.0/release-log.txt
Modified: oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
URL: http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java?rev=1453633&r1=1453632&r2=1453633&view=diff
==============================================================================
--- oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java (original)
+++ oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java Thu Mar 7 00:48:37 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/branches/branch-4.0/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/branches/branch-4.0/release-log.txt?rev=1453633&r1=1453632&r2=1453633&view=diff
==============================================================================
--- oozie/branches/branch-4.0/release-log.txt (original)
+++ oozie/branches/branch-4.0/release-log.txt Thu Mar 7 00:48:37 2013
@@ -1,5 +1,6 @@
-- 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)