You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/08/30 17:01:24 UTC
[1/2] git commit: ACCUMULO-1572 apply missing patch;
prevent logger from killing itself on a Disconnect event
Updated Branches:
refs/heads/1.4.4-SNAPSHOT 360392ca2 -> 351ad6e83
ACCUMULO-1572 apply missing patch; prevent logger from killing itself on a Disconnect event
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4ed51ecb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4ed51ecb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4ed51ecb
Branch: refs/heads/1.4.4-SNAPSHOT
Commit: 4ed51ecbca7d4120c5c31531ecbebb5d56a7b79f
Parents: 3e97167
Author: Eric Newton <ec...@apache.org>
Authored: Fri Aug 30 11:00:57 2013 -0400
Committer: Eric Newton <ec...@apache.org>
Committed: Fri Aug 30 11:00:57 2013 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/server/logger/LogService.java | 4 ++++
.../main/java/org/apache/accumulo/server/zookeeper/ZooLock.java | 3 +++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4ed51ecb/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java b/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
index b386234..ebfc287 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
@@ -373,6 +373,8 @@ public class LogService implements MutationLogger.Iface, Watcher {
@Override
public void process(WatchedEvent event) {
LOG.debug("event " + event.getPath() + " " + event.getType() + " " + event.getState());
+ if (event.getState() == KeeperState.Disconnected)
+ return;
if (event.getState() == KeeperState.Expired) {
LOG.warn("Logger lost zookeeper registration at " + event.getPath());
@@ -391,6 +393,8 @@ public class LogService implements MutationLogger.Iface, Watcher {
LOG.fatal("Stopping server, zookeeper entry lost " + event.getPath());
service.stop();
}
+ } catch (KeeperException.ConnectionLossException ex) {
+ LOG.info("Disconnected from zookeeper");
} catch (Exception ex) {
LOG.fatal("Stopping server, cannot reset watch" + ex);
service.stop();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4ed51ecb/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java b/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
index 03e84a7..c7e2f2f 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
@@ -344,6 +344,9 @@ public class ZooLock implements Watcher {
try { // set the watch on the parent node again
zooKeeper.getStatus(path, this);
watchingParent = true;
+ } catch (KeeperException.ConnectionLossException ex) {
+ // we can't look at the lock because we aren't connected, but our session is still good
+ log.warn("lost connection to zookeeper");
} catch (Exception ex) {
if (lock != null || asyncLock != null) {
lockWatcher.unableToMonitorLockNode(ex);
[2/2] git commit: Merge branch '1.4.4-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.4.4-SNAPSHOT
Posted by ec...@apache.org.
Merge branch '1.4.4-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.4.4-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/351ad6e8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/351ad6e8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/351ad6e8
Branch: refs/heads/1.4.4-SNAPSHOT
Commit: 351ad6e83c916a504730911dd82015b6a7e80aef
Parents: 4ed51ec 360392c
Author: Eric Newton <ec...@apache.org>
Authored: Fri Aug 30 11:01:14 2013 -0400
Committer: Eric Newton <ec...@apache.org>
Committed: Fri Aug 30 11:01:14 2013 -0400
----------------------------------------------------------------------
CHANGES | 60 +++++++++++++++++
pom.xml | 6 +-
src/assemble/build.sh | 2 +-
.../org/apache/accumulo/core/data/Mutation.java | 1 +
.../apache/accumulo/core/data/MutationTest.java | 69 ++++++++++++++++++++
5 files changed, 134 insertions(+), 4 deletions(-)
----------------------------------------------------------------------