Author: ecn
Date: Fri Apr 27 12:30:30 2012
New Revision: 1331391
URL: http://svn.apache.org/viewvc?rev=1331391&view=rev
Log:
ACCUMULO-505: merge to trunk
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1331388
Merged /accumulo/branches/1.4:r1331388
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/core:r1331388
Merged /accumulo/branches/1.4/src/core:r1331388
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1331388
Merged /accumulo/branches/1.4/src/server:r1331388
Modified:
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java?rev=1331391&r1=1331390&r2=1331391&view=diff
==============================================================================
---
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
(original)
+++
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
Fri Apr 27 12:30:30 2012
@@ -269,9 +269,10 @@ public class DefaultServlet extends Basi
Path path = new
Path(Monitor.getSystemConfiguration().get(Property.INSTANCE_DFS_DIR));
log.debug("Reading the content summary for " + path);
ContentSummary acu = fs.getContentSummary(path);
- consumed = String.format("%.2f%%", acu.getSpaceConsumed() * 100. /
fs.getUsed());
+ ContentSummary rootSummary = fs.getContentSummary(new Path("/"));
+ consumed = String.format("%.2f%%", acu.getSpaceConsumed() * 100. /
rootSummary.getSpaceConsumed());
diskUsed = bytes(acu.getSpaceConsumed());
-
+
boolean highlight = false;
tableRow(sb, (highlight = !highlight), "Disk Used", diskUsed);
if (fs.getUsed() != 0)
