accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1461550 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ server/src/main/java/org/apache/accumulo/server/master/ src/
Date Wed, 27 Mar 2013 12:44:49 GMT
Author: ecn
Date: Wed Mar 27 12:44:49 2013
New Revision: 1461550

URL: http://svn.apache.org/r1461550
Log:
ACCUMULO-1213 master did not transition from HAVE_LOCK to SAFE_MODE

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/examples/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java 
 (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1461548
  Merged /accumulo/branches/1.5:r1461549
  Merged /accumulo/branches/1.4:r1461548

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/assemble:r1461548
  Merged /accumulo/branches/1.4/assemble:r1461548
  Merged /accumulo/branches/1.5/assemble:r1461549

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1461549
  Merged /accumulo/branches/1.4/core:r1461548
  Merged /accumulo/branches/1.4/src/core:r1461548

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/examples:r1461548
  Merged /accumulo/branches/1.5/examples:r1461549

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1461549
  Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1461548
  Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1461548

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1461548
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1461549
  Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1461548

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/server:r1461548
  Merged /accumulo/branches/1.5/server:r1461549
  Merged /accumulo/branches/1.4/src/server:r1461548

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1461550&r1=1461549&r2=1461550&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java Wed
Mar 27 12:44:49 2013
@@ -1870,6 +1870,9 @@ public class Master implements LiveTServ
               if (getMasterState() == MasterState.NORMAL) {
                 setMasterState(MasterState.SAFE_MODE);
               }
+              if (getMasterState() == MasterState.HAVE_LOCK) {
+                setMasterState(MasterState.SAFE_MODE);
+              }
               break;
             case CLEAN_STOP:
               switch (getMasterState()) {

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1461548
  Merged /accumulo/branches/1.4/src/src:r1461548
  Merged /accumulo/branches/1.5/src:r1461549



Mime
View raw message