svn commit: r1346835 - in /accumulo/branches/1.4.1: ./ src/ src/core/ src/server/ src/server/src/main/java/org/apache/accumulo/server/Accumulo.java src/server/src/main/java/org/apache/accumulo/server/master/Master.java

[ecn]

Author: ecn
Date: Wed Jun  6 11:56:37 2012
New Revision: 1346835

URL: http://svn.apache.org/viewvc?rev=1346835&view=rev
Log:
ACCUMULO-49 merge final change to 1.4.1

Modified:
    accumulo/branches/1.4.1/   (props changed)
    accumulo/branches/1.4.1/src/   (props changed)
    accumulo/branches/1.4.1/src/core/   (props changed)
    accumulo/branches/1.4.1/src/server/   (props changed)
    
accumulo/branches/1.4.1/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
    
accumulo/branches/1.4.1/src/server/src/main/java/org/apache/accumulo/server/master/Master.java

Propchange: accumulo/branches/1.4.1/
------------------------------------------------------------------------------
  Merged /accumulo/trunk:r1341000
  Merged /accumulo/branches/1.4:r1346834

Propchange: accumulo/branches/1.4.1/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1341000
  Merged /accumulo/branches/1.4/src:r1346834
  Merged /accumulo/trunk:r1341000

Propchange: accumulo/branches/1.4.1/src/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/core:r1341000
  Merged /accumulo/trunk/core:r1341000
  Merged /accumulo/branches/1.4/src/core:r1346834

Propchange: accumulo/branches/1.4.1/src/server/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/server:r1341000
  Merged /accumulo/branches/1.4/src/server:r1346834
  Merged /accumulo/trunk/server:r1341000

Modified: 
accumulo/branches/1.4.1/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4.1/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java?rev=1346835&r1=1346834&r2=1346835&view=diff
==============================================================================
--- 
accumulo/branches/1.4.1/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
 (original)
+++ 
accumulo/branches/1.4.1/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
 Wed Jun  6 11:56:37 2012
@@ -167,8 +167,8 @@ public class Accumulo {
               int bytes = is.read(buffer);
               String setting = new String(buffer, 0, bytes);
               setting = setting.trim();
-              if (bytes > 0 && Integer.parseInt(setting) > 0) {
-                log.warn("System swappiness setting is greater than zero (" + 
setting + ") which can cause time-sensitive operations to be delayed. "
+              if (bytes > 0 && Integer.parseInt(setting) > 10) {
+                log.warn("System swappiness setting is greater than ten (" + 
setting + ") which can cause time-sensitive operations to be delayed. "
                     + " Accumulo is time sensitive because it needs to 
maintain distributed lock agreement.");
               }
             } finally {

Modified: 
accumulo/branches/1.4.1/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4.1/src/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1346835&r1=1346834&r2=1346835&view=diff
==============================================================================
--- 
accumulo/branches/1.4.1/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
 (original)
+++ 
accumulo/branches/1.4.1/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
 Wed Jun  6 11:56:37 2012
@@ -1189,6 +1189,8 @@ public class Master implements LiveTServ
           return TabletGoalState.HOSTED;
         return TabletGoalState.UNASSIGNED;
       case UNLOAD_ROOT_TABLET:
+       if (assignedOrHosted(METADATA_TABLE_ID) > 1)
+          return TabletGoalState.HOSTED;
         return TabletGoalState.UNASSIGNED;
       case STOP:
         return TabletGoalState.UNASSIGNED;