You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2014/07/03 23:07:40 UTC
git commit: OOZIE-1821 Oozie java action fails due to
AlreadyBeingCreatedException (abhishek.agarwal via rkanter)
Repository: oozie
Updated Branches:
refs/heads/master e20901133 -> 7c4c8ecfd
OOZIE-1821 Oozie java action fails due to AlreadyBeingCreatedException (abhishek.agarwal via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/7c4c8ecf
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/7c4c8ecf
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/7c4c8ecf
Branch: refs/heads/master
Commit: 7c4c8ecfddc7d5bb160075468eee06a66e52a97c
Parents: e209011
Author: Robert Kanter <rk...@cloudera.com>
Authored: Thu Jul 3 14:06:44 2014 -0700
Committer: Robert Kanter <rk...@cloudera.com>
Committed: Thu Jul 3 14:06:44 2014 -0700
----------------------------------------------------------------------
.../oozie/action/hadoop/LauncherMapperHelper.java | 8 ++++++--
.../main/java/org/apache/oozie/util/IOUtils.java | 17 +++++++++++++++++
release-log.txt | 1 +
3 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/7c4c8ecf/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 b893200..4fbe764 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
@@ -153,8 +153,12 @@ public class LauncherMapperHelper {
fs.mkdirs(actionDir);
OutputStream os = fs.create(new Path(actionDir, LauncherMapper.ACTION_CONF_XML));
- actionConf.writeXml(os);
- os.close();
+ try {
+ actionConf.writeXml(os);
+ } finally {
+ IOUtils.closeSafely(os);
+ }
+
launcherConf.setInputFormat(OozieLauncherInputFormat.class);
launcherConf.set("mapred.output.dir", new Path(actionDir, "output").toString());
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/7c4c8ecf/core/src/main/java/org/apache/oozie/util/IOUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/IOUtils.java b/core/src/main/java/org/apache/oozie/util/IOUtils.java
index 2e7c721..3a77221 100644
--- a/core/src/main/java/org/apache/oozie/util/IOUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/IOUtils.java
@@ -26,6 +26,7 @@ import java.io.Writer;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.Closeable;
import java.util.zip.ZipOutputStream;
import java.util.zip.ZipEntry;
import java.util.jar.JarOutputStream;
@@ -257,4 +258,20 @@ public abstract class IOUtils {
zipDir(classesDir, "", zos);
return jar;
}
+
+ /**
+ * Close a list of resources. </p> Any thrown exceptions are suppressed.
+ * @param objects list of objects to close
+ */
+ public static void closeSafely(Closeable... objects) {
+ for (Closeable object : objects) {
+ try {
+ if (null != object) {
+ object.close();
+ }
+ } catch (Throwable th) {
+ // ignore
+ }
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/7c4c8ecf/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 755c9f0..b700474 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1821 Oozie java action fails due to AlreadyBeingCreatedException (abhishek.agarwal via rkanter)
OOZIE-1532 Purging should remove completed children job for long running coordinator jobs (bzhang)
OOZIE-1909 log prefix information missing in JavaActionExecutor.check (ryota)
OOZIE-1907 DB upgrade from 3.3.0 to trunk fails on derby (rkanter)