Return-Path: X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 205EB9FF7 for ; Thu, 1 Mar 2012 17:55:55 +0000 (UTC) Received: (qmail 29738 invoked by uid 500); 1 Mar 2012 17:55:55 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 29720 invoked by uid 500); 1 Mar 2012 17:55:55 -0000 Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: accumulo-dev@incubator.apache.org Delivered-To: mailing list accumulo-commits@incubator.apache.org Received: (qmail 29712 invoked by uid 99); 1 Mar 2012 17:55:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Mar 2012 17:55:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Mar 2012 17:55:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6D867238889B; Thu, 1 Mar 2012 17:55:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1295712 - in /incubator/accumulo/trunk: ./ src/core/ src/server/ src/server/src/main/java/org/apache/accumulo/server/monitor/ src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/ src/server/src/main/resources/web/ Date: Thu, 01 Mar 2012 17:55:33 -0000 To: accumulo-commits@incubator.apache.org From: billie@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120301175533.6D867238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: billie Date: Thu Mar 1 17:55:32 2012 New Revision: 1295712 URL: http://svn.apache.org/viewvc?rev=1295712&view=rev Log: ACCUMULO-431 merged to trunk Modified: incubator/accumulo/trunk/ (props changed) incubator/accumulo/trunk/src/core/ (props changed) incubator/accumulo/trunk/src/server/ (props changed) incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java incubator/accumulo/trunk/src/server/src/main/resources/web/vis.xml Propchange: incubator/accumulo/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 1 17:55:32 2012 @@ -1,3 +1,3 @@ /incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632 /incubator/accumulo/branches/1.3.5rc:1209938 -/incubator/accumulo/branches/1.4:1201902-1295305 +/incubator/accumulo/branches/1.4:1201902-1295709 Propchange: incubator/accumulo/trunk/src/core/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 1 17:55:32 2012 @@ -1,3 +1,3 @@ -/incubator/accumulo/branches/1.3.5rc/src/core:1209938 /incubator/accumulo/branches/1.3/src/core:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215 -/incubator/accumulo/branches/1.4/src/core:1201902-1295271 +/incubator/accumulo/branches/1.3.5rc/src/core:1209938 +/incubator/accumulo/branches/1.4/src/core:1201902-1295709 Propchange: incubator/accumulo/trunk/src/server/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 1 17:55:32 2012 @@ -1,3 +1,3 @@ /incubator/accumulo/branches/1.3/src/server:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611 /incubator/accumulo/branches/1.3.5rc/src/server:1209938 -/incubator/accumulo/branches/1.4/src/server:1201902-1295305 +/incubator/accumulo/branches/1.4/src/server:1201902-1295709 Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java?rev=1295712&r1=1295711&r2=1295712&view=diff ============================================================================== --- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java (original) +++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java Thu Mar 1 17:55:32 2012 @@ -587,6 +587,10 @@ public class Monitor { } } + public static double getLookupRate() { + return lookupRateTracker.calculateRate(); + } + public static List> getQueryRateOverTime() { synchronized (queryRateOverTime) { return new ArrayList>(queryRateOverTime); Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java?rev=1295712&r1=1295711&r2=1295712&view=diff ============================================================================== --- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java (original) +++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java Thu Mar 1 17:55:32 2012 @@ -24,10 +24,14 @@ import java.util.ArrayList; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.master.thrift.TabletServerStatus; +import org.apache.accumulo.server.conf.ServerConfiguration; import org.apache.accumulo.server.monitor.Monitor; public class VisServlet extends BasicServlet { + private static final int concurrentScans = ServerConfiguration.getSystemConfiguration().getCount(Property.TSERV_READ_AHEAD_MAXCONCURRENT); + private static final long serialVersionUID = 1L; boolean useCircles; StatType motion; @@ -36,7 +40,52 @@ public class VisServlet extends BasicSer String url; public enum StatType { - osload, ingest, query + osload(ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors(), true, 100, "OS Load"), + ingest(1000, true, 1, "Ingest Entries"), + query(10000, true, 1, "Scan Entries"), + ingestMB(10, true, 10, "Ingest MB"), + queryMB(5, true, 10, "Scan MB"), + scans(concurrentScans * 2, false, 1, "Running Scans"), + scansessions(50, true, 10, "Scan Sessions"), + holdtime(60000, false, 1, "Hold Time"); + + private int max; + private boolean adjustMax; + private float significance; + private String description; + + /** + * @param max + * initial estimate of largest possible value for this stat + * @param adjustMax + * indicates whether max should be adjusted based on observed values + * @param significance + * values will be converted by floor(significance*value)/significance + * @param description + * as appears in selection box + */ + private StatType(int max, boolean adjustMax, float significance, String description) { + this.max = max; + this.adjustMax = adjustMax; + this.significance = significance; + this.description = description; + } + + public int getMax() { + return max; + } + + public boolean getAdjustMax() { + return adjustMax; + } + + public float getSignificance() { + return significance; + } + + public String getDescription() { + return description; + } } @Override @@ -127,13 +176,34 @@ public class VisServlet extends BasicSer sb.append("var numCores = " + ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors() + ";\n"); sb.append("var xmlurl = '" + url + "xml';\n"); sb.append("var visurl = '" + url + "vis';\n"); - sb.append("var serverurl = '" + url + "tservers?s=';\n"); + sb.append("var serverurl = '" + url + "tservers?s=';\n\n"); + sb.append("// observable stats that can be connected to motion or color\n"); + sb.append("var statName = ["); + for (StatType st : StatType.values()) + sb.append("'").append(st).append("',"); + sb.setLength(sb.length() - 1); + sb.append("];\n"); + sb.append("var maxStatValue = ["); + for (StatType st : StatType.values()) + sb.append(st.getMax()).append(","); + sb.setLength(sb.length() - 1); + sb.append("]; // initial values that are system-dependent may increase based on observed values\n"); + sb.append("var adjustMax = ["); + for (StatType st : StatType.values()) + sb.append(st.getAdjustMax()).append(","); + sb.setLength(sb.length() - 1); + sb.append("]; // whether to allow increases in the max based on observed values\n"); + sb.append("var significance = ["); + for (StatType st : StatType.values()) + sb.append(st.getSignificance()).append(","); + sb.setLength(sb.length() - 1); + sb.append("]; // values will be converted by floor(this*value)/this\n"); sb.append("\n"); } private void addOptions(StringBuilder sb, StatType selectedStatType) { for (StatType st : StatType.values()) { - sb.append("" : ">").append(st).append(""); + sb.append("" : ">").append(st.getDescription()).append(""); } } Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java?rev=1295712&r1=1295711&r2=1295712&view=diff ============================================================================== --- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java (original) +++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java Thu Mar 1 17:55:32 2012 @@ -87,6 +87,11 @@ public class XMLServlet extends BasicSer sb.append("").append(summary.ingestRate).append("\n"); sb.append("").append(summary.queryRate).append("\n"); + sb.append("").append(summary.ingestByteRate / 1000000.0).append("\n"); + sb.append("").append(summary.queryByteRate / 1000000.0).append("\n"); + sb.append("").append(summary.scans.running + summary.scans.queued).append(""); + sb.append("").append(Monitor.getLookupRate()).append("\n"); + sb.append("").append(status.holdTime).append("\n"); totalIngest += summary.ingestRate; totalQuery += summary.queryRate; totalEntries += summary.recs; Modified: incubator/accumulo/trunk/src/server/src/main/resources/web/vis.xml URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/resources/web/vis.xml?rev=1295712&r1=1295711&r2=1295712&view=diff ============================================================================== --- incubator/accumulo/trunk/src/server/src/main/resources/web/vis.xml (original) +++ incubator/accumulo/trunk/src/server/src/main/resources/web/vis.xml Thu Mar 1 17:55:32 2012 @@ -16,13 +16,6 @@ -->