You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by pb...@apache.org on 2017/03/22 11:23:15 UTC
[10/50] [abbrv] oozie git commit: Merge branch 'apache_forked_master'
into apache_forked_oya
Merge branch 'apache_forked_master' into apache_forked_oya
Change-Id: Ia3b7a5424fa912275acac9fe9d50be032df709c2
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/14aa8891
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/14aa8891
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/14aa8891
Branch: refs/heads/oya
Commit: 14aa8891a792d9b1cb8278dc20668580a37e270a
Parents: 77cd3f4 c58f545
Author: Peter Bacsko <pb...@cloudera.com>
Authored: Fri Jan 20 15:18:20 2017 +0100
Committer: Peter Bacsko <pb...@cloudera.com>
Committed: Fri Jan 20 15:18:20 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/oozie/ErrorCode.java | 2 +-
.../oozie/service/ZKJobsConcurrencyService.java | 2 +-
.../apache/oozie/service/ZKLocksService.java | 2 +-
.../java/org/apache/oozie/util/ZKUtils.java | 4 +-
core/src/main/resources/oozie-default.xml | 28 ++-
.../action/hadoop/TestJavaActionExecutor.java | 19 ++
.../oozie/service/TestConfigurationService.java | 10 +
distro/pom.xml | 18 --
docs/src/site/twiki/AG_Install.twiki | 8 +-
docs/src/site/twiki/DG_SshActionExtension.twiki | 3 +
.../site/twiki/ENG_Custom_Authentication.twiki | 158 --------------
login/README.txt | 118 ----------
login/pom.xml | 138 ------------
.../AltKerberosAuthenticationHandler.java | 138 ------------
.../ExampleAltAuthenticationHandler.java | 139 ------------
.../oozie/servlet/login/LDAPLoginServlet.java | 108 ----------
.../oozie/servlet/login/LoginServlet.java | 181 ----------------
.../src/main/resources/login-page-template.html | 36 ----
login/src/main/webapp/META-INF/context.xml | 19 --
login/src/main/webapp/WEB-INF/web.xml | 78 -------
.../TestExampleAltAuthenticationHandler.java | 141 ------------
.../servlet/login/TestLDAPLoginServlet.java | 167 ---------------
.../oozie/servlet/login/TestLoginServlet.java | 213 -------------------
pom.xml | 15 +-
release-log.txt | 11 +-
.../oozie/server/SSLServerConnectorFactory.java | 38 +++-
.../server/TestSSLServerConnectorFactory.java | 86 ++++----
sharelib/oozie/pom.xml | 14 +-
.../oozie/action/hadoop/LauncherMapper.java | 16 +-
.../oozie/action/hadoop/TestLauncherMapper.java | 88 ++++++++
sharelib/pig/pom.xml | 6 +-
.../org/apache/oozie/action/hadoop/PigMain.java | 82 +++++--
src/main/assemblies/distro.xml | 10 -
.../java/org/apache/oozie/tools/OozieDBCLI.java | 9 +-
34 files changed, 358 insertions(+), 1747 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/14aa8891/core/src/main/resources/oozie-default.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/14aa8891/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
----------------------------------------------------------------------
diff --cc core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
index 5996083,1c4b429..bd53978
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
@@@ -2301,4 -2941,30 +2301,23 @@@ public class TestJavaActionExecutor ext
assertEquals("DEBUG", conf.get(oozieActionHiveRootLogger));
}
+ public void testEmptyArgs() throws Exception {
+ String actionXml = "<java>" +
+ "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<name-node>" + getNameNodeUri() + "</name-node>" +
+ "<main-class>" + LauncherMainTester.class.getName() + "</main-class>" +
+ "<arg></arg>" +
+ "</java>";
+
+ Context context = createContext(actionXml, null);
- final RunningJob runningJob = submitAction(context);
- waitFor(60 * 1000, new Predicate() {
- @Override
- public boolean evaluate() throws Exception {
- return runningJob.isComplete();
- }
- });
- assertTrue(runningJob.isSuccessful());
++ submitAction(context);
++ waitUntilYarnAppDoneAndAssertSuccess(context.getAction().getExternalId());
+ ActionExecutor ae = new JavaActionExecutor();
+ ae.check(context, context.getAction());
- assertTrue(ae.isCompleted(context.getAction().getExternalStatus()));
- assertEquals("SUCCEEDED", context.getAction().getExternalStatus());
++ assertEquals("FAILED/KILLED", context.getAction().getExternalStatus());
+ assertNull(context.getAction().getData());
+
+ ae.end(context, context.getAction());
- assertEquals(WorkflowAction.Status.OK, context.getAction().getStatus());
++ assertEquals(WorkflowAction.Status.ERROR, context.getAction().getStatus());
+ }
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/14aa8891/core/src/test/java/org/apache/oozie/service/TestConfigurationService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/14aa8891/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 24dbd4f,15f4195..0dbdb11
--- a/pom.xml
+++ b/pom.xml
@@@ -1946,15 -1942,47 +1952,6 @@@
</properties>
</profile>
<profile>
- <id>loginServerExample</id>
- <id>hadoop-1</id>
-- <activation>
-- <activeByDefault>false</activeByDefault>
-- </activation>
- <modules>
- <module>login</module>
- </modules>
- <properties>
- <hadoop.version>1.2.1</hadoop.version>
- <hadoop.majorversion>1</hadoop.majorversion>
- <pig.classifier></pig.classifier>
- <sqoop.classifier>hadoop100</sqoop.classifier>
- <hive.version>0.13.1</hive.version>
- <hive.classifier></hive.classifier>
- <hive.jline.version>0.9.94</hive.jline.version>
- </properties>
- </profile>
- <profile>
- <id>hadoop-2</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <hadoop.version>2.4.0</hadoop.version>
- <hadoop.majorversion>2</hadoop.majorversion>
- <pig.classifier>h2</pig.classifier>
- <sqoop.classifier>hadoop200</sqoop.classifier>
- <jackson.version>1.9.13</jackson.version>
- </properties>
- </profile>
- <profile>
- <id>hadoop-3</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <hadoop.version>3.0.0-SNAPSHOT</hadoop.version>
- <hadoop.majorversion>3</hadoop.majorversion>
- <pig.classifier>h2</pig.classifier>
- <sqoop.classifier>hadoop200</sqoop.classifier>
- <jackson.version>1.9.13</jackson.version>
- </properties>
-- </profile>
-- <profile>
<id>spark-1</id>
<activation>
<activeByDefault>true</activeByDefault>
http://git-wip-us.apache.org/repos/asf/oozie/blob/14aa8891/release-log.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/14aa8891/sharelib/oozie/pom.xml
----------------------------------------------------------------------
diff --cc sharelib/oozie/pom.xml
index 6adbc64,f3ea071..be7cc54
--- a/sharelib/oozie/pom.xml
+++ b/sharelib/oozie/pom.xml
@@@ -61,9 -61,9 +61,14 @@@
<scope>test</scope>
</dependency>
++ <dependency>
++ <groupId>org.hamcrest</groupId>
++ <artifactId>hamcrest-all</artifactId>
++ </dependency>
++
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/oozie/blob/14aa8891/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java
----------------------------------------------------------------------
diff --cc sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java
index 013e6fe,8edebac..eda86f4
--- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java
+++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java
@@@ -49,11 -49,9 +49,12 @@@ import org.apache.hadoop.mapred.JobConf
import org.apache.hadoop.mapred.Mapper;
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reporter;
+import org.xml.sax.SAXException;
+ import com.google.common.base.Strings;
+import javax.xml.parsers.ParserConfigurationException;
+// TODO: OYA: Delete :)
public class LauncherMapper<K1, V1, K2, V2> implements Mapper<K1, V1, K2, V2>, Runnable {
static final String CONF_OOZIE_ACTION_MAIN_CLASS = "oozie.launcher.action.main.class";
http://git-wip-us.apache.org/repos/asf/oozie/blob/14aa8891/sharelib/pig/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/14aa8891/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
----------------------------------------------------------------------