You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ab...@apache.org on 2017/01/06 07:39:03 UTC
oozie git commit: OOZIE-2654 Zookeeper dependent services should not
depend on Connectionstate to be valid before cleaning up (venkatnrangan via
abhishekbafna)
Repository: oozie
Updated Branches:
refs/heads/master 9528a5350 -> 1431ca4ec
OOZIE-2654 Zookeeper dependent services should not depend on Connectionstate to be valid before cleaning up (venkatnrangan via abhishekbafna)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/1431ca4e
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/1431ca4e
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/1431ca4e
Branch: refs/heads/master
Commit: 1431ca4eca747df44073bc076339e13185305f30
Parents: 9528a53
Author: abhisek bafna <ab...@hortonworks.com>
Authored: Fri Jan 6 13:07:03 2017 +0530
Committer: abhisek bafna <ab...@hortonworks.com>
Committed: Fri Jan 6 13:07:03 2017 +0530
----------------------------------------------------------------------
.../java/org/apache/oozie/service/ZKJobsConcurrencyService.java | 2 +-
core/src/main/java/org/apache/oozie/service/ZKLocksService.java | 2 +-
core/src/main/java/org/apache/oozie/util/ZKUtils.java | 4 +---
release-log.txt | 1 +
4 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/1431ca4e/core/src/main/java/org/apache/oozie/service/ZKJobsConcurrencyService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/service/ZKJobsConcurrencyService.java b/core/src/main/java/org/apache/oozie/service/ZKJobsConcurrencyService.java
index a64f613..93f5bf8 100644
--- a/core/src/main/java/org/apache/oozie/service/ZKJobsConcurrencyService.java
+++ b/core/src/main/java/org/apache/oozie/service/ZKJobsConcurrencyService.java
@@ -83,7 +83,7 @@ public class ZKJobsConcurrencyService extends JobsConcurrencyService implements
*/
@Override
public void destroy() {
- if (leaderLatch != null && ZKConnectionListener.getZKConnectionState() != ConnectionState.LOST) {
+ if (leaderLatch != null) {
IOUtils.closeSafely(leaderLatch);
}
if (zk != null) {
http://git-wip-us.apache.org/repos/asf/oozie/blob/1431ca4e/core/src/main/java/org/apache/oozie/service/ZKLocksService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/service/ZKLocksService.java b/core/src/main/java/org/apache/oozie/service/ZKLocksService.java
index 8acbad9..83790cf 100644
--- a/core/src/main/java/org/apache/oozie/service/ZKLocksService.java
+++ b/core/src/main/java/org/apache/oozie/service/ZKLocksService.java
@@ -84,7 +84,7 @@ public class ZKLocksService extends MemoryLocksService implements Service, Instr
*/
@Override
public void destroy() {
- if (reaper != null && ZKConnectionListener.getZKConnectionState() != ConnectionState.LOST) {
+ if (reaper != null) {
try {
reaper.close();
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/1431ca4e/core/src/main/java/org/apache/oozie/util/ZKUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/ZKUtils.java b/core/src/main/java/org/apache/oozie/util/ZKUtils.java
index 8069641..5835fb2 100644
--- a/core/src/main/java/org/apache/oozie/util/ZKUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/ZKUtils.java
@@ -177,9 +177,7 @@ public class ZKUtils {
// If there are no more classes using ZooKeeper, we should teardown everything.
users.remove(user);
if (users.isEmpty() && zk != null) {
- if (ZKConnectionListener.getZKConnectionState() != ConnectionState.LOST) {
- zk.teardown();
- }
+ zk.teardown();
zk = null;
}
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/1431ca4e/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index ec25fd3..0afcd2d 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.4.0 release (trunk - unreleased)
+OOZIE-2654 Zookeeper dependent services should not depend on Connectionstate to be valid before cleaning up (venkatnrangan via abhishekbafna)
OOZIE-2519 Oozie HA with SSL info is slightly incorrect (andras.piros via rkanter)
OOZIE-2757 Malformed xml is Spark action doc page (gezapeti via abhishekbafna)
OOZIE-2616 Add Tez profile for Hive and Pig sharelibs (poeppt via rkanter)