accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1332225 - in /accumulo/branches/1.4: ./ src/ src/core/ src/server/ src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/MasterServlet.java
Date Mon, 30 Apr 2012 14:40:00 GMT
Author: ecn
Date: Mon Apr 30 14:40:00 2012
New Revision: 1332225

URL: http://svn.apache.org/viewvc?rev=1332225&view=rev
Log:
ACCUMULO-566 merge from trunk

Modified:
    accumulo/branches/1.4/   (props changed)
    accumulo/branches/1.4/src/   (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/monitor/servlets/MasterServlet.java

Propchange: accumulo/branches/1.4/
------------------------------------------------------------------------------
  Merged /accumulo/trunk:r1332224

Propchange: accumulo/branches/1.4/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1332224

Propchange: accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/core:r1332224

Propchange: accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/server:r1332224
  Merged /accumulo/trunk/server:r1332224

Modified: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/MasterServlet.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/MasterServlet.java?rev=1332225&r1=1332224&r2=1332225&view=diff
==============================================================================
--- accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/MasterServlet.java
(original)
+++ accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/MasterServlet.java
Mon Apr 30 14:40:00 2012
@@ -130,8 +130,8 @@ public class MasterServlet extends Basic
         slaves.add(down.server);
       }
       Table masterStatus = new Table("masterStatus", "Master Status");
-      masterStatus.addSortableColumn("#&nbsp;Online<br />Tablet&nbsp;Servers",
new NumberType<Integer>((int) (slaves.size() * 0.8), slaves.size(),
-          (int) (slaves.size() * 0.6), slaves.size()), "Number of tablet servers currently
available");
+      masterStatus.addSortableColumn("#&nbsp;Online<br />Tablet&nbsp;Servers",
new NumberType<Integer>((int) (slaves.size() * 0.8 + 1.0), slaves.size(),
+          (int) (slaves.size() * 0.6 + 1.0), slaves.size()), "Number of tablet servers currently
available");
       masterStatus.addSortableColumn("#&nbsp;Total<br />Tablet&nbsp;Servers",
new NumberType<Integer>(), "The total number of tablet servers configured");
       masterStatus.addSortableColumn("Loggers", new NumberType<Integer>((int) (slaves.size()
* .8), Integer.MAX_VALUE, 1, Integer.MAX_VALUE),
           "The number of write-ahead loggers.  This should be approximately the same as the
number of tablet servers (and greater than zero).");



Mime
View raw message