oozie git commit: OOZIE-2940 Possible NullPointerException in WorkflowActionBean (dionusos via gezapeti)

2017-08-15 Thread gezapeti 
Repository: oozie
Updated Branches:
  refs/heads/master 04a6d0541 -> 800ea758e


OOZIE-2940 Possible NullPointerException in WorkflowActionBean (dionusos via 
gezapeti)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/800ea758
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/800ea758
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/800ea758

Branch: refs/heads/master
Commit: 800ea758ea821ab16e16d94178dadd3fb71b6b53
Parents: 04a6d05
Author: Gezapeti Cseh 
Authored: Tue Aug 15 11:58:30 2017 +0200
Committer: Gezapeti Cseh 
Committed: Tue Aug 15 11:58:30 2017 +0200

--
 core/src/main/java/org/apache/oozie/WorkflowActionBean.java | 2 +-
 release-log.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/oozie/blob/800ea758/core/src/main/java/org/apache/oozie/WorkflowActionBean.java
--
diff --git a/core/src/main/java/org/apache/oozie/WorkflowActionBean.java 
b/core/src/main/java/org/apache/oozie/WorkflowActionBean.java
index 60f3b64..14f36ed 100644
--- a/core/src/main/java/org/apache/oozie/WorkflowActionBean.java
+++ b/core/src/main/java/org/apache/oozie/WorkflowActionBean.java
@@ -599,7 +599,7 @@ public class WorkflowActionBean implements Writable, 
WorkflowAction, JsonBean {
 public void setEndData(Status status, String signalValue) {
 if (status == null || (status != Status.OK && status != Status.ERROR 
&& status != Status.KILLED)) {
 throw new IllegalArgumentException("Action status must be OK, 
ERROR or KILLED. Received ["
-+ status.toString() + "]");
++ (status == null ? "null" : status.toString()) + "]");
 }
 if (status == Status.OK) {
 setErrorInfo(null, null);

http://git-wip-us.apache.org/repos/asf/oozie/blob/800ea758/release-log.txt
--
diff --git a/release-log.txt b/release-log.txt
index f3a1b46..1db2874 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.0.0 release (trunk - unreleased)
 
+OOZIE-2940 Possible NullPointerException in WorkflowActionBean (dionusos via 
gezapeti)
 OOZIE-3036 Spark 2.2.0 support: tell Spark not to get any delegation tokens 
(andras.piros via gezapeti)
 OOZIE-3028 Oozie Pig Action fails with no python dependencies (dbist13 via 
rohini)
 OOZIE-2670 Upgrade Hbase to 1.2 (gezapeti via asasvari)

oozie git commit: OOZIE-3036 Spark 2.2.0 support: tell Spark not to get any delegation tokens (andras.piros via gezapeti)

2017-08-15 Thread gezapeti 
Repository: oozie
Updated Branches:
  refs/heads/master 630171297 -> 04a6d0541


OOZIE-3036 Spark 2.2.0 support: tell Spark not to get any delegation tokens 
(andras.piros via gezapeti)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/04a6d054
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/04a6d054
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/04a6d054

Branch: refs/heads/master
Commit: 04a6d0541e83ab457db7c79e86986bb69a8eb432
Parents: 6301712
Author: Gezapeti Cseh 
Authored: Tue Aug 15 11:45:39 2017 +0200
Committer: Gezapeti Cseh 
Committed: Tue Aug 15 11:46:14 2017 +0200

--
 release-log.txt |  1 +
 .../oozie/action/hadoop/SparkArgsExtractor.java | 68 
 .../action/hadoop/TestSparkArgsExtractor.java   | 20 ++
 3 files changed, 77 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/oozie/blob/04a6d054/release-log.txt
--
diff --git a/release-log.txt b/release-log.txt
index 0b509bf..f3a1b46 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.0.0 release (trunk - unreleased)
 
+OOZIE-3036 Spark 2.2.0 support: tell Spark not to get any delegation tokens 
(andras.piros via gezapeti)
 OOZIE-3028 Oozie Pig Action fails with no python dependencies (dbist13 via 
rohini)
 OOZIE-2670 Upgrade Hbase to 1.2 (gezapeti via asasvari)
 OOZIE-2608 Comma in oozie.service.JPAService.jdbc.password value results in 
authentication error (gezapeti via asasvari)

http://git-wip-us.apache.org/repos/asf/oozie/blob/04a6d054/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkArgsExtractor.java
--
diff --git 
a/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkArgsExtractor.java
 
b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkArgsExtractor.java
index ffc95f9..052950f 100644
--- 
a/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkArgsExtractor.java
+++ 
b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkArgsExtractor.java
@@ -41,8 +41,12 @@ class SparkArgsExtractor {
 private static final String FILES_OPTION = "--files";
 private static final String ARCHIVES_OPTION = "--archives";
 private static final String LOG4J_CONFIGURATION_JAVA_OPTION = 
"-Dlog4j.configuration=";
-private static final String HIVE_SECURITY_TOKEN = 
"spark.yarn.security.tokens.hive.enabled";
-private static final String HBASE_SECURITY_TOKEN = 
"spark.yarn.security.tokens.hbase.enabled";
+private static final String SECURITY_TOKENS_HADOOPFS = 
"spark.yarn.security.tokens.hadoopfs.enabled";
+private static final String SECURITY_TOKENS_HIVE = 
"spark.yarn.security.tokens.hive.enabled";
+private static final String SECURITY_TOKENS_HBASE = 
"spark.yarn.security.tokens.hbase.enabled";
+private static final String SECURITY_CREDENTIALS_HADOOPFS = 
"spark.yarn.security.credentials.hadoopfs.enabled";
+private static final String SECURITY_CREDENTIALS_HIVE = 
"spark.yarn.security.credentials.hive.enabled";
+private static final String SECURITY_CREDENTIALS_HBASE = 
"spark.yarn.security.credentials.hbase.enabled";
 private static final String PWD = "$PWD" + File.separator + "*";
 private static final String MASTER_OPTION = "--master";
 private static final String MODE_OPTION = "--deploy-mode";
@@ -115,8 +119,15 @@ class SparkArgsExtractor {
 if (jarPath != null && jarPath.endsWith(".py")) {
 pySpark = true;
 }
-boolean addedHiveSecurityToken = false;
-boolean addedHBaseSecurityToken = false;
+
+boolean addedSecurityTokensHadoopFS = false;
+boolean addedSecurityTokensHive = false;
+boolean addedSecurityTokensHBase = false;
+
+boolean addedSecurityCredentialsHadoopFS = false;
+boolean addedSecurityCredentialsHive = false;
+boolean addedSecurityCredentialsHBase = false;
+
 boolean addedLog4jDriverSettings = false;
 boolean addedLog4jExecutorSettings = false;
 final StringBuilder driverClassPath = new StringBuilder();
@@ -146,12 +157,27 @@ class SparkArgsExtractor {
 addToSparkArgs = false;
 }
 }
-if (opt.startsWith(HIVE_SECURITY_TOKEN)) {
-addedHiveSecurityToken = true;
+
+if (opt.startsWith(SECURITY_TOKENS_HADOOPFS)) {
+addedSecurityTokensHadoopFS = true;
+}
+if (opt.startsWith(SECURITY_TOKENS_HIVE)) {
+addedSecurityTokensHive = true;