oozie git commit: OOZIE-2718 Improve -dryrun for bundles (zhengxb2005, asalamon74 via andras.piros)
Repository: oozie
Updated Branches:
refs/heads/master 647682940 -> 2a26670ea
OOZIE-2718 Improve -dryrun for bundles (zhengxb2005, asalamon74 via
andras.piros)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/2a26670e
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/2a26670e
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/2a26670e
Branch: refs/heads/master
Commit: 2a26670eae11c46086dcf683f0896bd278f116c5
Parents: 6476829
Author: Andras Piros
Authored: Mon Jul 30 15:35:18 2018 +0200
Committer: Andras Piros
Committed: Mon Jul 30 15:35:18 2018 +0200
--
.../java/org/apache/oozie/cli/OozieCLI.java | 13 +++--
.../command/bundle/BundleSubmitXCommand.java| 8 ---
.../bundle/TestBundleSubmitXCommand.java| 14 +-
.../command/coord/TestCoordUpdateXCommand.java | 5 --
docs/src/site/twiki/DG_CommandLineTool.twiki| 53 +++-
release-log.txt | 1 +
6 files changed, 63 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/oozie/blob/2a26670e/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
--
diff --git a/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
b/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
index c289971..9507a70 100644
--- a/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
+++ b/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
@@ -326,8 +326,8 @@ public class OozieCLI {
Option debug = new Option(DEBUG_OPTION, false, "Use debug mode to see
debugging statements on stdout");
Option rerun = new Option(RERUN_OPTION, true,
"rerun a job (coordinator requires -action or -date, bundle
requires -coordinator or -date)");
-Option dryrun = new Option(DRYRUN_OPTION, false, "Dryrun a workflow
(since 3.3.2) or coordinator (since 2.0) job without"
-+ " actually executing it");
+Option dryrun = new Option(DRYRUN_OPTION, false, "Dryrun a workflow
(since 3.3.2), a coordinator (since 2.0) "
++ " or a bundle (since 5.1) job without actually executing
it");
Option update = new Option(UPDATE_OPTION, true, "Update coord
definition and properties");
Option showdiff = new Option(SHOWDIFF_OPTION, true,
"Show diff of the new coord definition and properties with the
existing one (default true)");
@@ -1020,7 +1020,14 @@ public class OozieCLI {
String dryrunStr = wc.dryrun(getConfiguration(wc,
commandLine));
if (dryrunStr.equals("OK")) { // workflow
System.out.println("OK");
-} else {// coordinator
+}
+else if (dryrunStr.contains("http://git-wip-us.apache.org/repos/asf/oozie/blob/2a26670e/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
--
diff --git
a/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
b/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
index f94e871..c06759e 100644
---
a/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
+++
b/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
@@ -143,14 +143,6 @@ public class BundleSubmitXCommand extends
SubmitTransitionXCommand {
LogUtils.setLogInfo(bundleBean);
if (dryrun) {
-Date startTime = bundleBean.getStartTime();
-long startTimeMilli = startTime.getTime();
-long endTimeMilli = startTimeMilli + (3600 * 1000);
-Date jobEndTime = bundleBean.getEndTime();
-Date endTime = new Date(endTimeMilli);
-if (endTime.compareTo(jobEndTime) > 0) {
-endTime = jobEndTime;
-}
jobId = bundleBean.getId();
LOG.info("[" + jobId + "]: Update status to PREP");
bundleBean.setStatus(Job.Status.PREP);
http://git-wip-us.apache.org/repos/asf/oozie/blob/2a26670e/core/src/test/java/org/apache/oozie/command/bundle/TestBundleSubmitXCommand.java
--
diff --git
a/core/src/test/java/org/apache/oozie/command/bundle/TestBundleSubmitXCommand.java
b/core/src/test/java/org/apache/oozie/command/bundle/TestBundleSubmitXCommand.java
index 9c7a516..7c5f5b6 100644
---
a/core/src/test/java/org/apache/oozie/command/bundle/TestBundleSubmitXCommand.java
+++
b/core/src/test/java/org/apache/oozie/command/bundle/TestBundleSubmitXCommand.java
@@ -82,17 +82,14 @@ public class
oozie git commit: OOZIE-3156 amend Retry SSH action check when cannot connect to remote host (txsing, matijhs via andras.piros)
Repository: oozie Updated Branches: refs/heads/master 9e786aaea -> 647682940 OOZIE-3156 amend Retry SSH action check when cannot connect to remote host (txsing, matijhs via andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/64768294 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/64768294 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/64768294 Branch: refs/heads/master Commit: 647682940e3944d84ba4bcb3c950ce471c9ffdb6 Parents: 9e786aa Author: Andras Piros Authored: Mon Jul 30 15:14:00 2018 +0200 Committer: Andras Piros Committed: Mon Jul 30 15:14:00 2018 +0200 -- core/src/main/resources/oozie-default.xml | 2 +- release-log.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/oozie/blob/64768294/core/src/main/resources/oozie-default.xml -- diff --git a/core/src/main/resources/oozie-default.xml b/core/src/main/resources/oozie-default.xml index ff1820c..b69d2c9 100644 --- a/core/src/main/resources/oozie-default.xml +++ b/core/src/main/resources/oozie-default.xml @@ -2060,7 +2060,7 @@ will be the requeue interval for the actions which are waiting for a long time w -ooozie.action.ssh.check.retries.max +oozie.action.ssh.check.retries.max 3 Maximal retry count for ssh action status check http://git-wip-us.apache.org/repos/asf/oozie/blob/64768294/release-log.txt -- diff --git a/release-log.txt b/release-log.txt index eae3f83..acd5949 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-3156 amend Retry SSH action check when cannot connect to remote host (txsing, matijhs via andras.piros) OOZIE-3303 Oozie UI does not work after Jetty 9.3 upgrade (asalamon74 via gezapeti) OOZIE-2829 Improve sharelib upload to accept multiple source folders (kmarton via gezapeti) OOZIE-3309 Runtime error during /v2/sla filtering for bundle (asalamon74 via andras.piros)
oozie git commit: OOZIE-3303 Oozie UI does not work after Jetty 9.3 upgrade (asalamon74 via gezapeti)
Repository: oozie Updated Branches: refs/heads/master 3c03d03fe -> 9e786aaea OOZIE-3303 Oozie UI does not work after Jetty 9.3 upgrade (asalamon74 via gezapeti) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/9e786aae Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/9e786aae Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/9e786aae Branch: refs/heads/master Commit: 9e786aaea0ef70808e42aa2caa845400f6a43fd2 Parents: 3c03d03 Author: Gezapeti Cseh Authored: Mon Jul 30 14:46:25 2018 +0200 Committer: Gezapeti Cseh Committed: Mon Jul 30 14:47:03 2018 +0200 -- release-log.txt | 1 + webapp/pom.xml | 5 + 2 files changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/oozie/blob/9e786aae/release-log.txt -- diff --git a/release-log.txt b/release-log.txt index 9096017..eae3f83 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-3303 Oozie UI does not work after Jetty 9.3 upgrade (asalamon74 via gezapeti) OOZIE-2829 Improve sharelib upload to accept multiple source folders (kmarton via gezapeti) OOZIE-3309 Runtime error during /v2/sla filtering for bundle (asalamon74 via andras.piros) OOZIE-3306 Make it possible to override maven dependency plugin version number (asalamon74 via andras.piros) http://git-wip-us.apache.org/repos/asf/oozie/blob/9e786aae/webapp/pom.xml -- diff --git a/webapp/pom.xml b/webapp/pom.xml index 4a32b54..fd3f89f 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -148,6 +148,11 @@ hadoop-client provided + + +org.eclipse.jetty +apache-jsp +
oozie git commit: OOZIE-2829 Improve sharelib upload to accept multiple source folders (kmarton via gezapeti)
Repository: oozie Updated Branches: refs/heads/master 2dd10ff0f -> 3c03d03fe OOZIE-2829 Improve sharelib upload to accept multiple source folders (kmarton via gezapeti) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/3c03d03f Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/3c03d03f Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/3c03d03f Branch: refs/heads/master Commit: 3c03d03fe606659fd80c430b13f413fbdfa21faa Parents: 2dd10ff Author: Gezapeti Cseh Authored: Mon Jul 30 14:42:51 2018 +0200 Committer: Gezapeti Cseh Committed: Mon Jul 30 14:42:51 2018 +0200 -- docs/src/site/twiki/AG_Install.twiki| 8 +- release-log.txt | 1 + .../apache/oozie/tools/OozieSharelibCLI.java| 113 +++-- .../tools/IntegrationTestOozieSharelibCLI.java | 199 .../tools/OozieSharelibFileOperations.java | 7 +- .../tools/TestConcurrentCopyFromLocal.java | 4 +- .../oozie/tools/TestCopyTaskCallable.java | 3 +- .../oozie/tools/TestOozieSharelibCLI.java | 237 +++ .../TestOozieSharelibCLIExtraArgsParser.java| 66 ++ 9 files changed, 463 insertions(+), 175 deletions(-) -- http://git-wip-us.apache.org/repos/asf/oozie/blob/3c03d03f/docs/src/site/twiki/AG_Install.twiki -- diff --git a/docs/src/site/twiki/AG_Install.twiki b/docs/src/site/twiki/AG_Install.twiki index 46363a3..b8031c8 100644 --- a/docs/src/site/twiki/AG_Install.twiki +++ b/docs/src/site/twiki/AG_Install.twiki @@ -47,7 +47,7 @@ The =oozie-setup.sh= script options are: Usage : oozie-setup.sh - sharelib create -fs FS_URI [-locallib SHARED_LIBRARY] [-concurrency CONCURRENCY] + sharelib create -fs FS_URI [-locallib SHARED_LIBRARY] [-extralib EXTRA_SHARED_LIBRARY] [-concurrency CONCURRENCY] (create sharelib for oozie, FS_URI is the fs.default.name for hdfs uri; SHARED_LIBRARY, path to the @@ -55,6 +55,12 @@ Usage : oozie-setup.sh or an expanded version of it. If omitted, the Oozie sharelib tarball from the Oozie installation directory will be used. + EXTRA_SHARED_LIBRARY represents extra sharelib resources. +This option requires a pair of sharelibname +and comma-separated list of pathnames in the following format: + sharelib-name=path-name-1,path-name-2 +In case of more than one sharelib, this option can be specified +multiple times. CONCURRENCY is a number of threads to be used for copy operations. By default 1 thread will be used) http://git-wip-us.apache.org/repos/asf/oozie/blob/3c03d03f/release-log.txt -- diff --git a/release-log.txt b/release-log.txt index 733ea3d..9096017 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-2829 Improve sharelib upload to accept multiple source folders (kmarton via gezapeti) OOZIE-3309 Runtime error during /v2/sla filtering for bundle (asalamon74 via andras.piros) OOZIE-3306 Make it possible to override maven dependency plugin version number (asalamon74 via andras.piros) OOZIE-3208 "It should never happen" error messages should be more specific to root cause (kmarton via andras.piros) http://git-wip-us.apache.org/repos/asf/oozie/blob/3c03d03f/tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java -- diff --git a/tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java b/tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java index 75e932c..312770c 100644 --- a/tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java +++
oozie git commit: OOZIE-3309 Runtime error during /v2/sla filtering for bundle (asalamon74 via andras.piros)
Repository: oozie
Updated Branches:
refs/heads/master 4de5533c5 -> 2dd10ff0f
OOZIE-3309 Runtime error during /v2/sla filtering for bundle (asalamon74 via
andras.piros)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/2dd10ff0
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/2dd10ff0
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/2dd10ff0
Branch: refs/heads/master
Commit: 2dd10ff0fb7d7b53c0c177d5d4439fa065366f4c
Parents: 4de5533
Author: Andras Piros
Authored: Mon Jul 30 09:58:47 2018 +0200
Committer: Andras Piros
Committed: Mon Jul 30 09:58:47 2018 +0200
--
core/src/main/java/org/apache/oozie/servlet/V2SLAServlet.java | 6 --
.../test/java/org/apache/oozie/servlet/TestV2SLAServlet.java | 6 ++
release-log.txt| 1 +
3 files changed, 11 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/oozie/blob/2dd10ff0/core/src/main/java/org/apache/oozie/servlet/V2SLAServlet.java
--
diff --git a/core/src/main/java/org/apache/oozie/servlet/V2SLAServlet.java
b/core/src/main/java/org/apache/oozie/servlet/V2SLAServlet.java
index d578eaf..3982d1e 100644
--- a/core/src/main/java/org/apache/oozie/servlet/V2SLAServlet.java
+++ b/core/src/main/java/org/apache/oozie/servlet/V2SLAServlet.java
@@ -190,8 +190,10 @@ public class V2SLAServlet extends SLAServlet {
}
List jobIds = new ArrayList();
-for(SLASummaryBean summaryBean:slaSummaryList){
-jobIds.add(summaryBean.getId());
+if (slaSummaryList != null) {
+for (SLASummaryBean summaryBean : slaSummaryList) {
+jobIds.add(summaryBean.getId());
+}
}
List SLARegistrationList =
SLARegistrationQueryExecutor.getInstance().getList(
SLARegQuery.GET_SLA_CONFIGS, jobIds);
http://git-wip-us.apache.org/repos/asf/oozie/blob/2dd10ff0/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java
--
diff --git a/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java
b/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java
index d2bdb51..c2bbf1e 100644
--- a/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java
+++ b/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java
@@ -183,6 +183,12 @@ public class TestV2SLAServlet extends DagServletTestCase {
conn.setRequestMethod("GET");
assertEquals(HttpServletResponse.SC_BAD_REQUEST,
conn.getResponseCode());
+//test filter nonexistent bundle ID
+queryParams.put(RestConstants.TIME_ZONE_PARAM, "GMT");
+queryParams.put(RestConstants.JOBS_FILTER_PARAM,
String.format("bundle=%s",""));
+array = getSLAJSONResponse(queryParams);
+assertEquals(0, array.size());
+
//test filter bundle ID
queryParams.put(RestConstants.TIME_ZONE_PARAM, "GMT");
queryParams.put(RestConstants.JOBS_FILTER_PARAM,
String.format("bundle=%s",bundleId));
http://git-wip-us.apache.org/repos/asf/oozie/blob/2dd10ff0/release-log.txt
--
diff --git a/release-log.txt b/release-log.txt
index 2005b5f..733ea3d 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.1.0 release (trunk - unreleased)
+OOZIE-3309 Runtime error during /v2/sla filtering for bundle (asalamon74 via
andras.piros)
OOZIE-3306 Make it possible to override maven dependency plugin version number
(asalamon74 via andras.piros)
OOZIE-3208 "It should never happen" error messages should be more specific to
root cause (kmarton via andras.piros)
OOZIE-2791 ShareLib installation may fail on busy Hadoop clusters (asasvari,
kmarton via pbacsko, andras.piros)
