You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by sh...@apache.org on 2015/04/27 11:40:15 UTC
oozie git commit: OOZIE-2129 Duplicate child jobs per instance -
fixed job failure
Repository: oozie
Updated Branches:
refs/heads/master 44af3a3cb -> e86b96d45
OOZIE-2129 Duplicate child jobs per instance - fixed job failure
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/e86b96d4
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/e86b96d4
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/e86b96d4
Branch: refs/heads/master
Commit: e86b96d45cc7af706a0e0f5bd1bf36d760266c8e
Parents: 44af3a3
Author: Shwetha GS <ss...@hortonworks.com>
Authored: Mon Apr 27 15:10:06 2015 +0530
Committer: Shwetha GS <ss...@hortonworks.com>
Committed: Mon Apr 27 15:10:06 2015 +0530
----------------------------------------------------------------------
.../org/apache/oozie/action/hadoop/LauncherMapperHelper.java | 2 +-
.../org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java | 3 +++
.../org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java | 3 +++
.../org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java | 4 +++-
.../org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java | 1 +
.../main/java/org/apache/oozie/action/hadoop/LauncherMapper.java | 3 +++
6 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/e86b96d4/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapperHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapperHelper.java b/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapperHelper.java
index 6a93232..e22329d 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapperHelper.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapperHelper.java
@@ -164,7 +164,7 @@ public class LauncherMapperHelper {
public static void setupYarnRestartHandling(JobConf launcherJobConf, Configuration actionConf, String launcherTag)
throws NoSuchAlgorithmException {
- launcherJobConf.setLong("oozie.job.launch.time", System.currentTimeMillis());
+ launcherJobConf.setLong(LauncherMainHadoopUtils.OOZIE_JOB_LAUNCH_TIME, System.currentTimeMillis());
// Tags are limited to 100 chars so we need to hash them to make sure (the actionId otherwise doesn't have a max length)
String tag = getTag(launcherTag);
// keeping the oozie.child.mapreduce.job.tags instead of mapreduce.job.tags to avoid killing launcher itself.
http://git-wip-us.apache.org/repos/asf/oozie/blob/e86b96d4/hadooplibs/hadoop-utils-0.23/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
----------------------------------------------------------------------
diff --git a/hadooplibs/hadoop-utils-0.23/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java b/hadooplibs/hadoop-utils-0.23/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
index 9e34d0b..dca7820 100644
--- a/hadooplibs/hadoop-utils-0.23/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
+++ b/hadooplibs/hadoop-utils-0.23/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
@@ -23,6 +23,9 @@ import org.apache.hadoop.conf.Configuration;
public class LauncherMainHadoopUtils {
+ 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";
+
private LauncherMainHadoopUtils() {
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/e86b96d4/hadooplibs/hadoop-utils-1/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
----------------------------------------------------------------------
diff --git a/hadooplibs/hadoop-utils-1/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java b/hadooplibs/hadoop-utils-1/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
index 9e34d0b..dca7820 100644
--- a/hadooplibs/hadoop-utils-1/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
+++ b/hadooplibs/hadoop-utils-1/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
@@ -23,6 +23,9 @@ import org.apache.hadoop.conf.Configuration;
public class LauncherMainHadoopUtils {
+ 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";
+
private LauncherMainHadoopUtils() {
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/e86b96d4/hadooplibs/hadoop-utils-2/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
----------------------------------------------------------------------
diff --git a/hadooplibs/hadoop-utils-2/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java b/hadooplibs/hadoop-utils-2/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
index 9331c13..f6eda73 100644
--- a/hadooplibs/hadoop-utils-2/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
+++ b/hadooplibs/hadoop-utils-2/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
@@ -19,6 +19,7 @@
package org.apache.oozie.action.hadoop;
import java.io.IOException;
+import java.lang.String;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -39,6 +40,7 @@ import org.apache.hadoop.yarn.exceptions.YarnException;
public class LauncherMainHadoopUtils {
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";
private LauncherMainHadoopUtils() {
}
@@ -47,7 +49,7 @@ public class LauncherMainHadoopUtils {
System.out.println("Fetching child yarn jobs");
long startTime = 0L;
try {
- startTime = Long.parseLong((System.getProperty("oozie.job.launch.time")));
+ startTime = Long.parseLong(System.getProperty(OOZIE_JOB_LAUNCH_TIME));
} catch(NumberFormatException nfe) {
throw new RuntimeException("Could not find Oozie job launch time", nfe);
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/e86b96d4/hadooplibs/hadoop-utils-3/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
----------------------------------------------------------------------
diff --git a/hadooplibs/hadoop-utils-3/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java b/hadooplibs/hadoop-utils-3/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
index 211ba09..102a6c9 100644
--- a/hadooplibs/hadoop-utils-3/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
+++ b/hadooplibs/hadoop-utils-3/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
@@ -37,6 +37,7 @@ import org.apache.hadoop.yarn.exceptions.YarnException;
public class LauncherMainHadoopUtils {
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";
private LauncherMainHadoopUtils() {
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/e86b96d4/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java
----------------------------------------------------------------------
diff --git 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
index fe38976..7c4d48d 100644
--- 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
@@ -469,6 +469,9 @@ public class LauncherMapper<K1, V1, K2, V2> implements Mapper<K1, V1, K2, V2>, R
System.setProperty(ACTION_PREFIX + ACTION_DATA_NEW_ID, new File(ACTION_DATA_NEW_ID).getAbsolutePath());
System.setProperty(ACTION_PREFIX + ACTION_DATA_OUTPUT_PROPS, new File(ACTION_DATA_OUTPUT_PROPS).getAbsolutePath());
System.setProperty(ACTION_PREFIX + ACTION_DATA_ERROR_PROPS, new File(ACTION_DATA_ERROR_PROPS).getAbsolutePath());
+ System.setProperty(LauncherMainHadoopUtils.OOZIE_JOB_LAUNCH_TIME,
+ getJobConf().get(LauncherMainHadoopUtils.OOZIE_JOB_LAUNCH_TIME));
+
String actionConfigClass = getJobConf().get(OOZIE_ACTION_CONFIG_CLASS);
if (actionConfigClass != null) {
System.setProperty(OOZIE_ACTION_CONFIG_CLASS, actionConfigClass);