You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ge...@apache.org on 2016/10/10 11:52:43 UTC
[44/50] [abbrv] oozie git commit: Merge branch 'apache_forked_master'
into apache_forked_oya
http://git-wip-us.apache.org/repos/asf/oozie/blob/c49f382b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java
----------------------------------------------------------------------
diff --cc sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java
index 9b5d57d,785ca5e..338bce8
--- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java
+++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java
@@@ -27,12 -27,10 +27,14 @@@ import java.io.IOException
import java.io.InputStream;
import java.io.OutputStream;
import java.io.StringWriter;
+ import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+ import java.util.LinkedHashSet;
+import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@@ -53,11 -43,18 +55,22 @@@ import org.apache.hadoop.yarn.exception
public abstract class LauncherMain {
+ public static final String ACTION_PREFIX = "oozie.action.";
+ public static final String EXTERNAL_CHILD_IDS = ACTION_PREFIX + "externalChildIDs";
+ public static final String EXTERNAL_ACTION_STATS = ACTION_PREFIX + "stats.properties";
+ public static final String EXTERNAL_STATS_WRITE = ACTION_PREFIX + "external.stats.write";
+ public static final String OUTPUT_PROPERTIES = ACTION_PREFIX + "output.properties";
public static final String HADOOP_JOBS = "hadoopJobs";
public static final String MAPREDUCE_JOB_TAGS = "mapreduce.job.tags";
++
+ public static final String CHILD_MAPREDUCE_JOB_TAGS = "oozie.child.mapreduce.job.tags";
+ public static final String OOZIE_JOB_LAUNCH_TIME = "oozie.job.launch.time";
+
+ public static final String TEZ_APPLICATION_TAGS = "tez.application.tags";
+ public static final String SPARK_YARN_TAGS = "spark.yarn.tags";
+ protected static String[] HADOOP_SITE_FILES = new String[]
+ {"core-site.xml", "hdfs-site.xml", "mapred-site.xml", "yarn-site.xml"};
+
protected static void run(Class<? extends LauncherMain> klass, String[] args) throws Exception {
LauncherMain main = klass.newInstance();
main.run(args);
http://git-wip-us.apache.org/repos/asf/oozie/blob/c49f382b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/c49f382b/sharelib/pig/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/c49f382b/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/c49f382b/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/c49f382b/sharelib/spark/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/c49f382b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java
----------------------------------------------------------------------
diff --cc sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java
index 9dbd12f,407ba4b..65daef0
--- a/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java
+++ b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java
@@@ -64,8 -64,10 +64,10 @@@ public class SparkMain extends Launcher
protected void run(String[] args) throws Exception {
boolean isPyspark = false;
Configuration actionConf = loadActionConf();
+ prepareHadoopConfig(actionConf);
+
setYarnTag(actionConf);
- LauncherMainHadoopUtils.killChildYarnJobs(actionConf);
+ LauncherMain.killChildYarnJobs(actionConf);
String logFile = setUpSparkLog4J(actionConf);
List<String> sparkArgs = new ArrayList<String>();
http://git-wip-us.apache.org/repos/asf/oozie/blob/c49f382b/sharelib/sqoop/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/c49f382b/sharelib/sqoop/src/main/java/org/apache/oozie/action/hadoop/SqoopMain.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/c49f382b/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/c49f382b/sharelib/streaming/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/c49f382b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/c49f382b/webapp/pom.xml
----------------------------------------------------------------------