accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/6] git commit: ACCUMULO-2334 Comment in Master.upgradeZookeeper() about the checks that the monitor is also doing.
Date Tue, 11 Feb 2014 20:04:49 GMT
Updated Branches:
  refs/heads/1.5.1-SNAPSHOT fafa42961 -> 15bbd5393
  refs/heads/1.6.0-SNAPSHOT f9a196f10 -> e84fad8ac
  refs/heads/master 0a0be0f6b -> 9386be870


ACCUMULO-2334 Comment in Master.upgradeZookeeper() about the checks that the monitor is also
doing.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/15bbd539
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/15bbd539
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/15bbd539

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 15bbd5393029ac2538950ce36809dd24a4b2ec32
Parents: fafa429
Author: Josh Elser <elserj@apache.org>
Authored: Tue Feb 11 13:43:44 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Feb 11 13:43:44 2014 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/accumulo/server/master/Master.java | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/15bbd539/server/src/main/java/org/apache/accumulo/server/master/Master.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/master/Master.java b/server/src/main/java/org/apache/accumulo/server/master/Master.java
index ccb8622..039d7fa 100644
--- a/server/src/main/java/org/apache/accumulo/server/master/Master.java
+++ b/server/src/main/java/org/apache/accumulo/server/master/Master.java
@@ -273,6 +273,11 @@ public class Master implements LiveTServerSet.Listener, TableObserver,
CurrentSt
   }
   
   private void upgradeZookeeper() {
+    // 1.5.1 and 1.6.0 both do some state checking after obtaining the zoolock for the
+    // monitor and before starting up. It's not tied to the data version at all (and would
+    // introduce unnecessary complexity to try to make the master do it), but be aware
+    // that the master is not the only thing that may alter zookeeper before starting.
+
     if (Accumulo.getAccumuloPersistentVersion(fs) == Constants.PREV_DATA_VERSION) {
       try {
         log.info("Upgrading zookeeper");


Mime
View raw message