Author: mona
Date: Wed Sep 18 01:25:22 2013
New Revision: 1524269
URL: http://svn.apache.org/r1524269
Log:
OOZIE-1515 Passing superset of action id range should be allowed (mona)
Modified:
oozie/trunk/client/src/main/java/org/apache/oozie/client/OozieClient.java
oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
oozie/trunk/core/src/main/java/org/apache/oozie/servlet/BaseJobServlet.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionsKillXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
oozie/trunk/release-log.txt
Modified:
oozie/trunk/client/src/main/java/org/apache/oozie/client/OozieClient.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/client/src/main/java/org/apache/oozie/client/OozieClient.java?rev=1524269&r1=1524268&r2=1524269&view=diff
==============================================================================
--- oozie/trunk/client/src/main/java/org/apache/oozie/client/OozieClient.java
(original)
+++ oozie/trunk/client/src/main/java/org/apache/oozie/client/OozieClient.java
Wed Sep 18 01:25:22 2013
@@ -618,7 +618,6 @@ public class OozieClient {
@Override
protected Void call(HttpURLConnection conn) throws IOException,
OozieClientException {
- conn.setRequestProperty("content-type",
RestConstants.XML_CONTENT_TYPE);
if (!(conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
handleError(conn);
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordUtils.java?rev=1524269&r1=1524268&r2=1524269&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
(original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordUtils.java Wed
Sep 18 01:25:22 2013
@@ -39,6 +39,7 @@ import org.apache.oozie.service.Services
import org.apache.oozie.util.CoordActionsInDateRange;
import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.ParamChecker;
+import org.apache.oozie.util.XLog;
import org.jdom.Element;
public class CoordUtils {
@@ -202,12 +203,19 @@ public class CoordUtils {
// Retrieve the actions using the corresponding actionIds
List<CoordinatorActionBean> coordActions = new
ArrayList<CoordinatorActionBean>();
for (String id : actions) {
- CoordinatorActionBean coordAction;
+ CoordinatorActionBean coordAction = null;
try {
coordAction = jpaService.execute(new
CoordActionGetJPAExecutor(id));
}
catch (JPAExecutorException je) {
- throw new CommandException(je);
+ if (je.getErrorCode().equals(ErrorCode.E0605)) { //ignore
retrieval of non-existent actions in range
+ XLog.getLog(CoordUtils.class).warn(
+ "Coord action [{0}] not yet materialized. Hence
skipping over it for Kill action", id);
+ continue;
+ }
+ else {
+ throw new CommandException(je);
+ }
}
coordActions.add(coordAction);
}
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/servlet/BaseJobServlet.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/BaseJobServlet.java?rev=1524269&r1=1524268&r2=1524269&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/servlet/BaseJobServlet.java
(original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/servlet/BaseJobServlet.java
Wed Sep 18 01:25:22 2013
@@ -93,7 +93,6 @@ public abstract class BaseJobServlet ext
response.setStatus(HttpServletResponse.SC_OK);
}
else if (action.equals(RestConstants.JOB_ACTION_KILL)) {
- validateContentType(request, RestConstants.XML_CONTENT_TYPE);
stopCron();
JSONObject json = killJob(request, response);
startCron();
Modified:
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionsKillXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionsKillXCommand.java?rev=1524269&r1=1524268&r2=1524269&view=diff
==============================================================================
---
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionsKillXCommand.java
(original)
+++
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionsKillXCommand.java
Wed Sep 18 01:25:22 2013
@@ -79,7 +79,7 @@ public class TestCoordActionsKillXComman
JPAService jpaService = services.get(JPAService.class);
String[] ids = createDBRecords();
- new CoordActionsKillXCommand(ids[0], "action", "1").call();
+ new CoordActionsKillXCommand(ids[0], "action", "1,3").call();
CoordinatorActionBean action = jpaService.execute(new
CoordActionGetForCheckJPAExecutor(ids[1]));
assertEquals(CoordinatorAction.Status.KILLED, action.getStatus());
Modified:
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java?rev=1524269&r1=1524268&r2=1524269&view=diff
==============================================================================
---
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
(original)
+++
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
Wed Sep 18 01:25:22 2013
@@ -246,7 +246,6 @@ public class TestCoordRerunXCommand exte
try {
final OozieClient coordClient = LocalOozie.getCoordClient();
coordClient.reRunCoord(jobId,
RestConstants.JOB_COORD_SCOPE_ACTION, rerunScope, false, true);
- fail("Exception expected because one action is missing from db.");
}
catch (OozieClientException ex) {
}
Modified: oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1524269&r1=1524268&r2=1524269&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Wed Sep 18 01:25:22 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1515 Passing superset of action id range should be allowed (mona)
OOZIE-1530 Fork-join mismatch makes workflow Failed but some actions stay
Running (mona)
OOZIE-1539 Load more coordinator jobs eligible to be materialized in
MaterializeTriggerService (mona)
OOZIE-1528 CoordRerunX and ActionEndX not updating some of the modified beans.
(virag)
