You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by pu...@apache.org on 2016/09/12 23:10:10 UTC
oozie git commit: OOZIE-2653 Close active connection to hcat server
in fs action
Repository: oozie
Updated Branches:
refs/heads/master 58e510f3b -> abea46ac3
OOZIE-2653 Close active connection to hcat server in fs action
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/abea46ac
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/abea46ac
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/abea46ac
Branch: refs/heads/master
Commit: abea46ac340e3306bd16e4bacdfd529ec2acc82d
Parents: 58e510f
Author: Purshotam Shah <pu...@yahoo-inc.com>
Authored: Mon Sep 12 16:09:55 2016 -0700
Committer: Purshotam Shah <pu...@yahoo-inc.com>
Committed: Mon Sep 12 16:09:55 2016 -0700
----------------------------------------------------------------------
.../org/apache/oozie/action/hadoop/FsActionExecutor.java | 9 ++++++++-
release-log.txt | 1 +
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/abea46ac/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java
index 121cd49..2765474 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java
@@ -381,6 +381,7 @@ public class FsActionExecutor extends ActionExecutor {
throws ActionExecutorException {
URI uri = path.toUri();
URIHandler handler;
+ org.apache.oozie.dependency.URIHandler.Context hcatContext = null;
try {
handler = Services.get().get(URIHandlerService.class).getURIHandler(uri);
if (handler instanceof FSURIHandler) {
@@ -416,12 +417,18 @@ public class FsActionExecutor extends ActionExecutor {
}
}
} else {
- handler.delete(uri, handler.getContext(uri, fsConf, context.getWorkflow().getUser(), false));
+ hcatContext = handler.getContext(uri, fsConf, context.getWorkflow().getUser(), false);
+ handler.delete(uri, hcatContext);
}
}
catch (Exception ex) {
throw convertException(ex);
}
+ finally{
+ if (hcatContext != null) {
+ hcatContext.destroy();
+ }
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/oozie/blob/abea46ac/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 7355929..8e6e791 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.3.0 release (trunk - unreleased)
+OOZIE-2653 Close active connection to hcat server in fs action (satishsaley via puru)
OOZIE-2617 Read properties files in action configurations (wutaklon via jaydeepvishwakarma)
OOZIE-2615 Flaky tests TestCoordActionsKillXCommand.testActionKillCommandActionNumbers and testActionKillCommandDate (pbacsko via rkanter)
OOZIE-2632 Provide database dump/load functionality to make database migration easier (gezapeti, rjustice via rkanter)