accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1330267 - in /accumulo/branches/1.4: ./ src/core/ src/server/ src/server/src/main/java/org/apache/accumulo/server/master/Master.java
Date Wed, 25 Apr 2012 13:16:08 GMT
Author: ecn
Date: Wed Apr 25 13:16:07 2012
New Revision: 1330267

URL: http://svn.apache.org/viewvc?rev=1330267&view=rev
Log:
ACCUMULO-520: merge to 1.4

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

Propchange: accumulo/branches/1.4/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.3:r1330264

Propchange: accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.3/src/core:r1330264

Propchange: accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.3/src/server:r1330264

Modified: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1330267&r1=1330266&r2=1330267&view=diff
==============================================================================
--- accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
(original)
+++ accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
Wed Apr 25 13:16:07 2012
@@ -421,7 +421,7 @@ public class Master implements LiveTServ
             TableCounts counts = entry.getValue();
             TableState tableState = manager.getTableState(tableId.toString());
             if (tableState != null && tableState.equals(TableState.ONLINE)) {
-              result += counts.unassigned() + counts.assignedToDeadServers();
+              result += counts.unassigned() + counts.assignedToDeadServers() + counts.assigned();
             }
           }
         }



Mime
View raw message