accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [3/5] ACCUMULO-1487, ACCUMULO-1491 Stop packaging docs for monitor
Date Fri, 28 Mar 2014 00:43:27 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/docs/src/main/resources/metrics.html
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/metrics.html b/docs/src/main/resources/metrics.html
new file mode 100644
index 0000000..00f0a5b
--- /dev/null
+++ b/docs/src/main/resources/metrics.html
@@ -0,0 +1,182 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<html>
+<head>
+<title>Accumulo Metrics</title>
+<link rel='stylesheet' type='text/css' href='documentation.css' media='screen'/>
+</head>
+<body>
+
+<h1>Apache Accumulo Documentation : Metrics</h1>
+
+As of version 1.2, metrics for the Master, Tablet Servers, and Loggers are available. A new configuration file, accumulo-metrics.xml, is located in the conf directory and can
+be modified to turn metrics collection on or off, and to enable file logging if desired. This file can be modified at runtime and the changes will be seen after a few seconds.
+Except where specified all time values are in milliseconds.
+<h1>Master Metrics</h1>
+<p>JMX Object Name: org.apache.accumulo.server.metrics:type=MasterMetricsMBean,name= &lt;current thread name&gt;</p>
+<table>
+	<thead>
+		<tr><td>Method Name</td><td>Description</td></tr>
+	</thead>
+	<tbody>
+		<tr class="highlight"><td>public long getPingCount();</td><td>Number of pings to tablet servers</td></tr>
+		<tr><td>public long getPingAvgTime();</td><td>Average time for each ping</td></tr>
+		<tr class="highlight"><td>public long getPingMinTime();</td><td>Minimum time for each ping</td></tr>
+		<tr><td>public long getPingMaxTime();</td><td>Maximum time for each ping</td></tr>
+		<tr class="highlight"><td>public String getTServerWithHighestPingTime();</td><td>tablet server with highest ping</td></tr>
+		<tr><td>public void reset();</td><td>Resets all counters to zero</td></tr>
+	</tbody>
+</table>
+<h1>Logging Server Metrics</h1>
+<p>JMX Object Name: org.apache.accumulo.server.metrics:type=LogWriterMBean,name= &lt;current thread name&gt;</p>
+<table>
+	<thead>
+		<tr><td>Method Name</td><td>Description</td></tr>
+	</thead>
+	<tbody>
+		<tr class="highlight"><td>public long getCloseCount();</td><td>Number of closed log files</td></tr>
+		<tr><td>public long getCloseAvgTime();</td><td>Average time to close a log file</td></tr>
+		<tr class="highlight"><td>public long getCloseMinTime();</td><td>Minimum time to close a log file</td></tr>
+		<tr><td>public long getCloseMaxTime();</td><td>Maximum time to close a log file</td></tr>
+		<tr class="highlight"><td>public long getCopyCount();</td><td>Number of log files copied</td></tr>
+		<tr><td>public long getCopyAvgTime();</td><td>Average time to copy a log file</td></tr>
+		<tr class="highlight"><td>public long getCopyMinTime();</td><td>Minimum time to copy a log file</td></tr>
+		<tr><td>public long getCopyMaxTime();</td><td>Maximum time to copy a log file</td></tr>
+		<tr class="highlight"><td>public long getCreateCount();</td><td>Number of log files created</td></tr>
+		<tr><td>public long getCreateMinTime();</td><td>Minimum time to create a log file</td></tr>
+		<tr class="highlight"><td>public long getCreateMaxTime();</td><td>Maximum time to create a log file</td></tr>
+		<tr><td>public long getCreateAvgTime();</td><td>Average time to create a log file</td></tr>
+		<tr class="highlight"><td>public long getLogAppendCount();</td><td>Number of times logs have been appended</td></tr>
+		<tr><td>public long getLogAppendMinTime();</td><td>Minimum time to append to a log file</td></tr>
+		<tr class="highlight"><td>public long getLogAppendMaxTime();</td><td>Maximum time to append to a log file</td></tr>
+		<tr><td>public long getLogAppendAvgTime();</td><td>Average time to append to a log file</td></tr>
+		<tr class="highlight"><td>public long getLogFlushCount();</td><td>Number of log file flushes</td></tr>
+		<tr><td>public long getLogFlushMinTime();</td><td>Minimum time to flush a log file</td></tr>
+		<tr class="highlight"><td>public long getLogFlushMaxTime();</td><td>Maximum time to flush a log file</td></tr>
+		<tr><td>public long getLogFlushAvgTime();</td><td>Average time to flush a log file</td></tr>
+		<tr class="highlight"><td>public long getLogExceptionCount();</td><td>Number of log exceptions</td></tr>
+		<tr><td>public void reset();</td><td>Resets all counters to zero</td></tr>
+	</tbody>
+</table>
+<h1>Tablet Server Metrics</h1>
+<p>JMX Object Name: org.apache.accumulo.server.metrics:type=TabletServerMBean,name= &lt;current thread name&gt;</p>
+<table>
+	<thead>
+		<tr><td>Method Name</td><td>Description</td></tr>
+	</thead>
+	<tbody>
+		<tr class="highlight"><td>public int getOnlineCount();</td><td>Number of tablets online</td></tr>
+		<tr><td>public int getOpeningCount();</td><td>Number of tablets that are being opened</td></tr>
+		<tr class="highlight"><td>public int getUnopenedCount();</td><td>Number or unopened tablets</td></tr>
+		<tr><td>public int getMajorCompactions();</td><td>Number of Major Compactions currently running</td></tr>
+		<tr class="highlight"><td>public int getMajorCompactionsQueued();</td><td>Number of Major Compactions yet to run</td></tr>
+		<tr><td>public int getMinorCompactions();</td><td>Number of Minor Compactions currently running</td></tr>
+		<tr class="highlight"><td>public int getMinorCompactionsQueued();</td><td>Number of Minor Compactions yet to run</td></tr>
+		<tr><td>public int getShutdownStage();</td><td>Current stage in the shutdown process</td></tr>
+		<tr class="highlight"><td>public long getEntries();</td><td>Number of entries in all the tablets</td></tr>
+		<tr><td>public long getEntriesInMemory();</td><td>Number of entries in memory on all tablet servers</td></tr>
+		<tr class="highlight"><td>public long getQueries();</td><td>Number of queries currently running on all the tablet servers</td></tr>
+		<tr><td>public long getIngest();</td><td>Number of entries currently being ingested on all the tablet servers</td></tr>
+		<tr class="highlight"><td>public long getTotalMinorCompactions();</td><td>Number of Minor Compactions completed</td></tr>
+		<tr><td>public double getHoldTime();</td><td>Number of seconds that ingest is waiting for memory to be freed on tablet servers</td></tr>
+		<tr class="highlight"><td>public String getName();</td><td>Address of the master</td></tr>
+	</tbody>
+</table>
+<h1>Tablet Server Minor Compaction Metrics</h1>
+<p>JMX Object Name: org.apache.accumulo.server.metrics:type=TabletServerMinCMetricsMBean,name= &lt;current thread name&gt;</p>
+<table>
+	<thead>
+		<tr><td>Method Name</td><td>Description</td></tr>
+	</thead>
+	<tbody>
+		<tr class="highlight"><td>public long getMinorCompactionCount();</td><td>Number of completed Minor Compactions on all tablet servers</td></tr>
+		<tr><td>public long getMinorCompactionAvgTime();</td><td>Average time to complete Minor Compaction</td></tr>
+		<tr class="highlight"><td>public long getMinorCompactionMinTime();</td><td>Minimum time to complete Minor Compaction</td></tr>
+		<tr><td>public long getMinorCompactionMaxTime();</td><td>Maximum time to complete Minor Compaction</td></tr>
+		<tr class="highlight"><td>public long getMinorCompactionQueueCount();</td><td>Number of Minor Compactions yet to be run</td></tr>
+		<tr><td>public long getMinorCompactionQueueAvgTime();</td><td>Average time Minor Compaction is in the queue</td></tr>
+		<tr class="highlight"><td>public long getMinorCompactionQueueMinTime();</td><td>Minimum time Minor Compaction is in the queue</td></tr>
+		<tr><td>public long getMinorCompactionQueueMaxTime();</td><td>Maximum time Minor Compaction is in the queue</td></tr>
+		<tr class="highlight"><td>public void reset();</td><td>Resets all counters to zero</td></tr>
+	</tbody>
+</table>
+<h1>Tablet Server Scan Metrics</h1>
+<p>JMX Object Name: org.apache.accumulo.server.metrics:type=TabletServerScanMetricsMBean,name= &lt;current thread name&gt;</p>
+<table>
+	<thead>
+		<tr><td>Method Name</td><td>Description</td></tr>
+	</thead>
+	<tbody>
+		<tr class="highlight"><td>public long getScanCount();</td><td>Number of scans completed</td></tr>
+		<tr><td>public long getScanAvgTime();</td><td>Average time for scan operation</td></tr>
+		<tr class="highlight"><td>public long getScanMinTime();</td><td>Minimum time for scan operation</td></tr>
+		<tr><td>public long getScanMaxTime();</td><td>Maximum time for scan operation</td></tr>
+		<tr class="highlight"><td>public long getResultCount();</td><td>Number of scans that returned a result</td></tr>
+		<tr><td>public long getResultAvgSize();</td><td>Average size of scan result</td></tr>
+		<tr class="highlight"><td>public long getResultMinSize();</td><td>Minimum size of scan result</td></tr>
+		<tr><td>public long getResultMaxSize();</td><td>Maximum size of scan result</td></tr>
+		<tr class="highlight"><td>public void reset();</td><td>Resets all counters to zero</td></tr>
+	</tbody>
+</table>
+<h1>Tablet Server Update Metrics</h1>
+<p>JMX Object Name: org.apache.accumulo.server.metrics:type=TabletServerUpdateMetricsMBean,name= &lt;current thread name&gt;</p>
+<table>
+	<thead>
+		<tr><td>Method Name</td><td>Description</td></tr>
+	</thead>
+	<tbody>
+		<tr class="highlight"><td>public long getPermissionErrorCount();</td><td>Number of permission errors</td></tr>
+		<tr><td>public long getUnknownTabletErrorCount();</td><td>Number of unknown tablet errors</td></tr>
+		<tr class="highlight"><td>public long getMutationArrayAvgSize();</td><td>Average size of mutation array</td></tr>
+		<tr><td>public long getMutationArrayMinSize();</td><td>Minimum size of mutation array</td></tr>
+		<tr class="highlight"><td>public long getMutationArrayMaxSize();</td><td>Maximum size of mutation array</td></tr>
+		<tr><td>public long getCommitPrepCount();</td><td>Number of commit preparations</td></tr>
+		<tr class="highlight"><td>public long getCommitPrepMinTime();</td><td>Minimum time for commit preparation</td></tr>
+		<tr><td>public long getCommitPrepMaxTime();</td><td>Maximum time for commit preparatation</td></tr>
+		<tr class="highlight"><td>public long getCommitPrepAvgTime();</td><td>Average time for commit preparation</td></tr>
+		<tr><td>public long getConstraintViolationCount();</td><td>Number of constraint violations</td></tr>
+		<tr class="highlight"><td>public long getWALogWriteCount();</td><td>Number of writes to the Write Ahead Log</td></tr>
+		<tr><td>public long getWALogWriteMinTime();</td><td>Minimum time of a write to the Write Ahead Log</td></tr>
+		<tr class="highlight"><td>public long getWALogWriteMaxTime();</td><td>Maximum time of a write to the Write Ahead Log</td></tr>
+		<tr><td>public long getWALogWriteAvgTime();</td><td>Average time of a write to the Write Ahead Log</td></tr>
+		<tr class="highlight"><td>public long getCommitCount();</td><td>Number of commits</td></tr>
+		<tr><td>public long getCommitMinTime();</td><td>Minimum time for a commit</td></tr>
+		<tr class="highlight"><td>public long getCommitMaxTime();</td><td>Maximum time for a commit</td></tr>
+		<tr><td>public long getCommitAvgTime();</td><td>Average time for a commit</td></tr>
+		<tr class="highlight"><td>public void reset();</td><td>Resets all counters to zero</td></tr>
+	</tbody>
+</table>
+<h1>Thrift Server Metrics</h1>
+<p>JMX Object Name: org.apache.accumulo.server.metrics:type=ThriftMetricsMBean,name= &lt;thread name&gt;</p>
+<table>
+	<thead>
+		<tr><td>Method Name</td><td>Description</td></tr>
+	</thead>
+	<tbody>
+		<tr class="highlight"><td>public long getIdleCount();</td><td>Number of times the Thrift server has been idle</td></tr>
+		<tr><td>public long getIdleMinTime();</td><td>Minimum amount of time the Thrift server has been idle</td></tr>
+		<tr class="highlight"><td>public long getIdleMaxTime();</td><td>Maximum amount of time the Thrift server has been idle</td></tr>
+		<tr><td>public long getIdleAvgTime();</td><td>Average time the Thrift server has been idle</td></tr>
+		<tr class="highlight"><td>public long getExecutionCount();</td><td>Number of calls processed by the Thrift server</td></tr>
+		<tr><td>public long getExecutionMinTime();</td><td>Minimum amount of time executing method</td></tr>
+		<tr class="highlight"><td>public long getExecutionMaxTime();</td><td>Maximum amount of time executing method</td></tr>
+		<tr><td>public long getExecutionAvgTime();</td><td>Average time executing methods</td></tr>
+		<tr class="highlight"><td>public void reset();</td><td>Resets all counters to zero</td></tr>
+	</tbody>
+</table>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/docs/src/main/resources/timestamps.html
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/timestamps.html b/docs/src/main/resources/timestamps.html
new file mode 100644
index 0000000..9c240d2
--- /dev/null
+++ b/docs/src/main/resources/timestamps.html
@@ -0,0 +1,160 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<html>
+<head>
+<title>Accumulo Timestamps</title>
+<link rel='stylesheet' type='text/css' href='documentation.css' media='screen'/>
+</head>
+<body>
+
+<h1>Apache Accumulo Documentation : Timestamps</h1>
+
+<p>Everything inserted into accumulo has a timestamp. If the user does not
+set it, then the system will set the timestamp. The timestamp is the last
+thing accumulo sorts on. So when two keys have the same row, column family,
+column qualifier, and column visibility then the timestamp of the two keys is
+compared.
+
+<p>Timestamps are sorted in descending order, so the most recent data comes
+first. When a table is created in accumulo, by default it has a versioning
+iterator that only shows the most recent. In the example below two identical
+things are inserted. The scan after that only shows the most recent version.
+However when the versioning iterator configuration is changed, then both are
+seen. When data is inserted with a lower timestamp than existing data, it will
+fall behind the existing data and may not be seen depending on the versioning
+settings. This is why the insert made with a timestamp of 500 is not seen in
+the scan below.
+
+<p><pre>
+root@ac12&gt; createtable foo
+root@ac12 foo&gt;
+root@ac12 foo&gt;
+root@ac12 foo&gt; insert r1 cf1 cq1 value1
+root@ac12 foo&gt; insert r1 cf1 cq1 value2
+root@ac12 foo&gt; scan -st
+r1 cf1:cq1 [] 1279906856203    value2
+root@ac12 foo&gt; config -t foo -f iterator
+---------+---------------------------------------------+-----------------------------------------------------------------------------------------------------
+SCOPE    | NAME                                        | VALUE
+---------+---------------------------------------------+-----------------------------------------------------------------------------------------------------
+table    | table.iterator.majc.vers .................. | 20,org.apache.accumulo.core.iterators.VersioningIterator
+table    | table.iterator.majc.vers.opt.maxVersions .. | 1
+table    | table.iterator.minc.vers .................. | 20,org.apache.accumulo.core.iterators.VersioningIterator
+table    | table.iterator.minc.vers.opt.maxVersions .. | 1
+table    | table.iterator.scan.vers .................. | 20,org.apache.accumulo.core.iterators.VersioningIterator
+table    | table.iterator.scan.vers.opt.maxVersions .. | 1
+---------+---------------------------------------------+-----------------------------------------------------------------------------------------------------
+root@ac12 foo&gt; config -t foo -s table.iterator.scan.vers.opt.maxVersions=3
+root@ac12 foo&gt; config -t foo -s table.iterator.minc.vers.opt.maxVersions=3
+root@ac12 foo&gt; config -t foo -s table.iterator.majc.vers.opt.maxVersions=3
+root@ac12 foo&gt; scan -st
+r1 cf1:cq1 [] 1279906856203    value2
+r1 cf1:cq1 [] 1279906853170    value1
+root@ac12 foo&gt; insert -t 600 r1 cf1 cq1 value3
+root@ac12 foo&gt; insert -t 500 r1 cf1 cq1 value4
+root@ac12 foo&gt; scan -st
+r1 cf1:cq1 [] 1279906856203    value2
+r1 cf1:cq1 [] 1279906853170    value1
+r1 cf1:cq1 [] 600    value3
+root@ac12 foo&gt;
+
+</pre>
+
+<p>Deletes are special keys in accumulo that get sorted along will all the other
+data. When a delete key is inserted, accumulo will not show anything that has
+a timestamp less than or equal to the delete key. In the example below an
+insert is made with timestamp 5 and then a delete is inserted with timestamp 3.
+The scan after that show that the delete marker does not hide the key. However
+when a delete is inserted with timestamp 5, then nothing can be seen. Once a
+delete marker is inserted, it is there until a full major compaction occurs.
+That is why the insert made after the delete can not be seen. The insert after
+the flush and compact commands can be seen because the delete marker is gone.
+The flush forced a minor compaction and compact forced a full major compaction.
+
+<p><pre>
+root@ac12&gt; createtable bar
+root@ac12 bar&gt; insert -t 5 r1 cf1 cq1 val1
+root@ac12 bar&gt; scan -st
+r1 cf1:cq1 [] 5    val1
+root@ac12 bar&gt; delete -t 3 r1 cf1 cq1
+root@ac12 bar&gt; scan
+r1 cf1:cq1 []    val1
+root@ac12 bar&gt; scan -st
+r1 cf1:cq1 [] 5    val1
+root@ac12 bar&gt; delete -t 5 r1 cf1 cq1
+root@ac12 bar&gt; scan -st
+root@ac12 bar&gt; insert -t 5 r1 cf1 cq1 val2
+root@ac12 bar&gt; scan -st
+root@ac12 bar&gt; flush -t bar
+23 14:01:36,587 [shell.Shell] INFO : Flush of table bar initiated...
+root@ac12 bar&gt; compact -t bar
+23 14:02:00,042 [shell.Shell] INFO : Compaction of table bar scheduled for 20100723140200EDT
+root@ac12 bar&gt; insert -t 5 r1 cf1 cq1 val1
+root@ac12 bar&gt; scan
+r1 cf1:cq1 []    val1
+</pre>
+
+<p>If two inserts are made into accumulo with the same row, column, and
+timestamp, then the behavior is non-deterministic.
+
+<p>Accumulo 1.2 introduces the concept of logical time. This ensures that
+timestamps set by accumulo always move forward. There have been many problems
+caused by tablet servers with different system times. In the case where a
+tablet servers time is in the future, tablets hosted on that tablet server and
+then migrated will have future timestamps in their data. This can cause newer
+keys to fall behind existing keys, which can result in seeing older data or not
+seeing data if a new key falls behind on old delete. Logical time prevents
+this by ensuring that accumulo set time stamps never go backwards, on a per
+tablet basis. So if a tablet servers time is a year in the future, then any
+tablet hosted there will generate timestamps a year in the future even when
+later hosted on a server with correct time. Logical time can be configured on a
+per table basis to either set time in millis or to use a per tablet counter.
+The per tablet counter gives unique one up time stamps on a per mutation
+basis. When using time in millis, if two things arrive within the same
+millisecond then both receive the same timestamp.
+
+<p>The example below shows a table created using a per tablet counter for
+timestamps. Two inserts are made, the first gets timestamp 0 the second 1.
+After that the table is split into two tablets and two more inserts are made.
+These inserts get the same timestamp because they are made on different
+tablets. When the original tablet is split into two, the two child tablets
+inherit the next timestamp of their parent and start from there. So do not
+expect this configuration to offer unique timestamps across a table. Its only
+purpose is to uniquely order events within a tablet.
+
+<p><pre>
+root@ac12 foo&gt; createtable -tl logical
+root@ac12 logical&gt; insert 000892 person name "John Doe"
+root@ac12 logical&gt; insert 003042 person name "Jane Doe"
+root@ac12 logical&gt; scan -st
+000892 person:name [] 0    John Doe
+003042 person:name [] 1    Jane Doe
+root@ac12 logical&gt;
+root@ac12 logical&gt; addsplits -t logical 002000
+root@ac12 logical&gt; insert 003042 person address "123 Somewhere"
+root@ac12 logical&gt; insert 000892 person address "123 Nowhere"
+root@ac12 logical&gt; scan -st
+000892 person:address [] 2    123 Nowhere
+000892 person:name [] 0    John Doe
+003042 person:address [] 2    123 Somewhere
+003042 person:name [] 1    Jane Doe
+root@ac12 logical&gt;
+
+</pre>
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f06380e..c1e4b5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -654,8 +654,8 @@
           <configuration>
             <arguments>-P apache-release,thrift,assemble,docs,rpm,deb</arguments>
             <autoVersionSubmodules>true</autoVersionSubmodules>
-            <goals>clean compile javadoc:aggregate deploy</goals>
-            <preparationGoals>clean compile javadoc:aggregate verify</preparationGoals>
+            <goals>clean deploy</goals>
+            <preparationGoals>clean verify</preparationGoals>
             <tagNameFormat>@{project.version}</tagNameFormat>
             <releaseProfiles>seal-jars</releaseProfiles>
             <useReleaseProfile>false</useReleaseProfile>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
index bf65dae..22728e2 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
@@ -140,8 +140,7 @@ abstract public class BasicServlet extends HttpServlet {
     // BEGIN HEADER
     sb.append("<head>\n");
     sb.append("<title>").append(getTitle(req)).append(" - Accumulo ").append(Constants.VERSION).append("</title>\n");
-    if ((refresh > 0) && (req.getRequestURI().startsWith("/docs") == false) && (req.getRequestURI().startsWith("/vis") == false)
-        && (req.getRequestURI().startsWith("/shell") == false))
+    if ((refresh > 0) && (req.getRequestURI().startsWith("/vis") == false) && (req.getRequestURI().startsWith("/shell") == false))
       sb.append("<meta http-equiv='refresh' content='" + refresh + "' />\n");
     sb.append("<meta http-equiv='Content-Type' content='").append(DEFAULT_CONTENT_TYPE).append("' />\n");
     sb.append("<meta http-equiv='Content-Script-Type' content='text/javascript' />\n");
@@ -184,7 +183,6 @@ abstract public class BasicServlet extends HttpServlet {
     sb.append("<a href='/gc'>Garbage&nbsp;Collector</a><br />\n");
     sb.append("<a href='/tables'>Tables</a><br />\n");
     sb.append("<a href='/trace/summary?minutes=10'>Recent&nbsp;Traces</a><br />\n");
-    sb.append("<a href='/docs'>Documentation</a><br />\n");
     List<DedupedLogEvent> dedupedLogEvents = LogService.getInstance().getEvents();
     int numLogs = dedupedLogEvents.size();
     boolean logsHaveError = false;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java
index 31e63ed..d88bd7c 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.monitor.servlets;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -32,7 +31,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.accumulo.core.Constants;
-import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
 import org.apache.accumulo.core.util.Duration;
 import org.apache.accumulo.core.util.NumUtil;
@@ -55,7 +53,7 @@ public class DefaultServlet extends BasicServlet {
 
   @Override
   protected String getTitle(HttpServletRequest req) {
-    return req.getRequestURI().startsWith("/docs") ? "Documentation" : "Accumulo Overview";
+    return "Accumulo Overview";
   }
 
   private void getResource(HttpServletRequest req, HttpServletResponse resp) throws IOException {
@@ -94,18 +92,6 @@ public class DefaultServlet extends BasicServlet {
   public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
     if (req.getRequestURI().startsWith("/web"))
       getResource(req, resp);
-    else if (req.getRequestURI().equals("/docs") || req.getRequestURI().equals("/docs/apidocs"))
-      super.doGet(req, resp);
-    else if (req.getRequestURI().equals("/docs/config.html"))
-      new DefaultConfiguration() {
-
-        public void generate(HttpServletResponse resp) throws IOException {
-          generateDocumentation(new PrintStream(resp.getOutputStream()));
-
-        }
-      }.generate(resp);
-    else if (req.getRequestURI().startsWith("/docs"))
-      getResource(req, resp);
     else if (req.getRequestURI().startsWith("/monitor"))
       resp.sendRedirect("/master");
     else if (req.getRequestURI().startsWith("/errors"))
@@ -201,10 +187,6 @@ public class DefaultServlet extends BasicServlet {
 
   @Override
   protected void pageBody(HttpServletRequest req, HttpServletResponse resp, StringBuilder sb) throws IOException {
-    if (req.getRequestURI().equals("/docs") || req.getRequestURI().equals("/docs/apidocs")) {
-      sb.append("<object data='").append(req.getRequestURI()).append("/index.html' type='text/html' width='100%' height='100%'></object>");
-      return;
-    }
 
     sb.append("<table class='noborder'>\n");
     sb.append("<tr>\n");
@@ -266,12 +248,12 @@ public class DefaultServlet extends BasicServlet {
     } else {
       long totalAcuBytesUsed = 0l;
       long totalHdfsBytesUsed = 0l;
-      
+
       try {
         for (String baseDir : VolumeConfiguration.getVolumeUris(ServerConfiguration.getSiteConfiguration())) {
           final Path basePath = new Path(baseDir);
           final FileSystem fs = vm.getVolumeByPath(basePath).getFileSystem();
-          
+
           try {
             // Calculate the amount of space used by Accumulo on the FileSystem
             ContentSummary accumuloSummary = fs.getContentSummary(basePath);
@@ -306,7 +288,7 @@ public class DefaultServlet extends BasicServlet {
         if (totalAcuBytesUsed > 0) {
           // Convert Accumulo usage to a readable String
           diskUsed = bytes(totalAcuBytesUsed);
-          
+
           if (totalHdfsBytesUsed > 0) {
             // Compute amount of space used by Accumulo as a percentage of total space usage.
             consumed = String.format("%.2f%%", totalAcuBytesUsed * 100. / totalHdfsBytesUsed);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/administration.html
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/resources/docs/administration.html b/server/monitor/src/main/resources/docs/administration.html
deleted file mode 100644
index 51b1c31..0000000
--- a/server/monitor/src/main/resources/docs/administration.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<html>
-<head>
-<title>Accumulo Administration</title>
-<link rel='stylesheet' type='text/css' href='documentation.css' media='screen'/>
-</head>
-<body>
-
-<h1>Apache Accumulo Documentation : Administration</h1>
-
-<h3>Starting accumulo for the first time</h3>
-
-<p>For the most part, accumulo is ready to go out of the box. To start it, first you must distribute and install
-the accumulo software to each machine in the cloud that you wish to run on. The software should be installed
-in the same directory on each machine and configured identically (or at least similarly... see the configuration
-sections for more details). Select one machine to be your bootstrap machine, the one that you will start accumulo
-with. Note that you must have passphrase-less ssh access to each machine from your bootstrap machine. On this machine,
-create a conf/masters and conf/slaves file. In the masters file, type the hostname of the machine you wish to run the master on (probably localhost).
-In the slaves file, type the hostnames, separated by newlines of each machine you wish to participate in accumulo as a tablet server. If you neglect
-to create these files, the startup scripts will assume you are trying to run on localhost only, and will instantiate a single-node instance only.
-It is probably a good idea to back up these files, or distribute them to the other nodes as well, so that you can easily boot up accumulo
-from another machine, if necessary. You can also make create a <code>conf/accumulo-env.sh</code> file if you want to configure any custom environment variables.
-
-<p>Once properly configured, you can initialize or prepare an instance of accumulo by running: <code>bin/accumulo&nbsp;init</code><br />
-Follow the prompts and you are ready to go. This step only prepares accumulo to run, it does not start up accumulo.
-
-<h3>Starting accumulo</h3>
-
-<p>Once you have configured accumulo to your liking, and distributed the appropriate configuration to each machine, you can start accumulo with
-bin/start-all.sh. If at any time, you wish to bring accumulo servers online after one or more have been shutdown, you can run bin/start-all.sh again.
-This step will only start services that are not already running. Be aware that if you run this command on more than one machine, you may unintentionally
-start an extra copy of the garbage collector service and the monitoring service, since each of these will run on the server on which you run this script.
-
-<h3>Stopping accumulo</h3>
-
-<p>Similar to the start-all.sh script, we provide a bin/stop-all.sh script to shut down accumulo. This will prompt for the root password so that it can
-ask the master to shut down the tablet servers gracefully. If the tablet servers do not respond, or the master takes too long, you can force a shutdown by hitting Ctrl-C
-at the password prompt, and waiting 15 seconds for the script to force a shutdown. Normally, once the shutdown happens gracefully, unresponsive tablet servers are
-forcibly shut down after 5 seconds.
-
-<h3>Adding a Node</h3>
-
-<p>Update your <code>$ACCUMULO_HOME/conf/slaves</code> (or <code>$ACCUMULO_CONF_DIR/slaves</code>) file to account for the addition; at a minimum this needs to be on the host(s) being added, but in practice it's good to ensure consistent configuration across all nodes.</p>
-
-<pre>
-$ACCUMULO_HOME/bin/accumulo admin start &gt;host(s)&gt; {&lt;host&gt; ...}
-</pre>
-
-<p>Alternatively, you can ssh to each of the hosts you want to add and run <code>$ACCUMULO_HOME/bin/start-here.sh</code>.</p>
-
-<p>Make sure the host in question has the new configuration, or else the tablet server won't start.</p>
-
-<h3>Decomissioning a Node</h3>
-
-<p>If you need to take a node out of operation, you can trigger a graceful shutdown of a tablet server. Accumulo will automatically rebalance the tablets across the available tablet servers.</p>
-
-<pre>
-$ACCUMULO_HOME/bin/accumulo admin stop &gt;host(s)&gt; {&lt;host&gt; ...}
-</pre>
-
-<p>Alternatively, you can ssh to each of the hosts you want to remove and run <code>$ACCUMULO_HOME/bin/stop-here.sh</code>.</p>
-
-<p>Be sure to update your <code>$ACCUMULO_HOME/conf/slaves</code> (or <code>$ACCUMULO_CONF_DIR/slaves</code>) file to account for the removal of these hosts. Bear in mind that the monitor will not re-read the slaves file automatically, so it will report the decomissioned servers as down; it's recommended that you restart the monitor so that the node list is up to date.</p>
-
-<h3>Configuration</h3>
-<p>Accumulo configuration information is stored in a xml file and ZooKeeper.  System wide
-configuration information is stored in accumulo-site.xml. In order for accumulo to
-find this file its directory must be on the classpath.  Accumulo will log a warning if it can not find 
-it, and will use built-in default values. The accumulo scripts try to put the config directory on the classpath.  
-
-<p>Starting with version 1.0, per-table configuration was
-introduced. This information is stored in ZooKeeper. This information
-can be manipulated using the config command in the accumulo
-shell. ZooKeeper will notify all tablet servers when config properties
-are modified. This makes it possible to change major compaction
-settings, for example, for a table while accumulo is running.
-
-<p>Per-table configuration settings override system settings. 
-
-<p>See the possible configuration options and their default values <a href='config.html'>here</a>
-
-<h3>Managing system resources</h3>
-
-<p>It is very important how disk and memory usage are allocated across the cluster and how servers processes are allocated across the cluster. 
-
-<ul>
- <li> On larger clusters, run the namenode, secondary namenode, jobtracker, accumulo master, and zookeepers on dedicated nodes.  On a smaller cluster you may want to run all master processes on one node.  When doing this ensure that the max total memory that could be used by all master processes does not exceed system memory.  Swapping on your single master node would not be good.
- <li> Accumulo 1.2 and earlier rely on zookeeper but do not use it heavily.  On a large cluster setting up 3 or 5 zookeepers should be plenty.  Since there is no performance gain when running more zookeepers, fault tolerance is the only benefit.
- <li> On slave nodes ensure the memory used by all slave processes is less than system memory.  For example the following slave node config could use up to 38G of RAM : tablet server 3G, logger 1G, data node 2G, up to 10 mappers each using 2G, and up 6 reducers each using 2G.  If the slave nodes only have 32G, then using 38G will result in swapping which could cause tablet server to lose their lock in zookeeper and die.  Even if swapping does not cause tablet servers to die, it will kill performance.
- <li>Accumulo and map reduce will work with less memory, but it has an impact.  Accumulo will minor compact more frequently when it has less map memory, resulting in more major compactions.  The minor and major compactions both use CPU and HDFS I/O.   The same goes for map reduce, the less memory you give it, the more it has to sort and spill.  Try to minimize spilling and compactions as much as possible without causing swapping.
- <li>Accumulo writes data to disk before it sorts it in memory.  This allows data that was in memory when a tablet server crashes to be recovered.  Each slave node needs a local directory to write this data to.  Ensure the file system holding this directory has at least 100G free on all nodes.  Also, if this directory is in a filesystem used by map reduce or hdfs they may effect each others performance.
-</ul>
-
-<p>There are a few settings that determine how much memory accumulo tablet
-servers use.  In accumulo-env.sh there is a setting called
-ACCUMULO_TSERVER_OPTS.  By default this is set to something like "-Xmx512m
--Xms512m".  These are Java jvm options asking Java to use 512 megabytes of
-memory.  By default accumulo stores data written to it outside of the Java
-memory space in order to avoid pauses caused by the Java garbage collector.  The
-amount of memory it uses for this data is determined by the accumulo setting
-"tserver.memory.maps.max".  Since this memory is outside of the Java managed
-memory, the process can grow larger than the -Xmx setting.  So if -Xmx is set
-to 512M and tserver.memory.maps.max is set to 1G, a tablet server process can
-be expected to use 1.5G.  If tserver.memory.maps.native.enabled is set to
-false, then accumulo will only use memory managed by Java and the process will
-not use more than what -Xmx is set to.  In this case the
-tserver.memory.maps.max setting should be 75% of the -Xmx setting. 
-
-<h3>Swappiness</h3>
-
-<p>The linux kernel will swap out memory of running programs to increase
-the size of the disk buffers.  This tendency to swap out is controlled by
-a kernel setting called "swappiness."  This behavior does not work well for
-large java servers.  When a java process runs a garbage collection, it touches
-lots of pages forcing all swapped out pages back into memory.  It is suggested
-that swappiness be set to zero.
-
-<pre>
- # sysctl -w vm.swappiness=0
- # echo "vm.swappiness = 0" &gt;&gt; /etc/sysctl.conf
-</pre>
-
-<h3>Hadoop timeouts</h3>
-
-<p>In order to detect failed datanodes, use shorter timeouts.  Add the following to your
-hdfs-site.xml file:
-
-<pre>
-
-  &lt;property&gt;
-    &lt;name&gt;dfs.socket.timeout&lt;/name&gt;
-    &lt;value&gt;3000&lt;/value&gt;
-  &lt;/property&gt;
-
-  &lt;property&gt;
-    &lt;name&gt;dfs.socket.write.timeout&lt;/name&gt;
-    &lt;value&gt;5000&lt;/value&gt;
-  &lt;/property&gt;
-
-  &lt;property&gt;
-    &lt;name&gt;ipc.client.connect.timeout&lt;/name&gt;
-    &lt;value&gt;1000&lt;/value&gt;
-  &lt;/property&gt;
-
-  &lt;property&gt;
-    &lt;name&gt;ipc.clident.connect.max.retries.on.timeouts&lt;/name&gt;
-    &lt;value&gt;2&lt;/value&gt;
-  &lt;/property&gt;
-
-
-
-</pre>
-
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/bulkIngest.html
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/resources/docs/bulkIngest.html b/server/monitor/src/main/resources/docs/bulkIngest.html
deleted file mode 100644
index 86cdb71..0000000
--- a/server/monitor/src/main/resources/docs/bulkIngest.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<html>
-<head>
-<title>Accumulo Bulk Ingest</title>
-<link rel='stylesheet' type='text/css' href='documentation.css' media='screen'/>
-</head>
-<body>
-
-<h1>Apache Accumulo Documentation : Bulk Ingest</h2>
-
-<p>Accumulo supports the ability to import sorted files produced by an
-external process into an online table.  Often, it is much faster to churn
-through large amounts of data using map/reduce to produce the these files. 
-The new files can be incorporated into Accumulo using bulk ingest.
-
-<ul>
-<li>Construct an <code>org.apache.accumulo.core.client.Connector</code> instance</li>
-<li>Call <code>connector.tableOperations().getSplits()</code></li>
-<li>Run a map/reduce job using <a href='apidocs/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.html'>RangePartitioner</a> 
-with splits from the previous step</li>
-<li>Call <code>connector.tableOperations().importDirectory()</code> passing the output directory of the MapReduce job</li>
-</ul> 
-
-<p>Files can also be imported using the "importdirectory" shell command.
-
-<p>A complete example is available in <a href='examples/README.bulkIngest'>README.bulkIngest</a>
-
-<p>Importing data using whole files of sorted data can be very efficient, but it differs
-from live ingest in the following ways:
-<ul>
- <li>Table constraints are not applied against they data in the file.
- <li>Adding new files to tables are likely to trigger major compactions.
- <li>The timestamp in the file could contain strange values.  Accumulo can be asked to use the ingest timestamp for all values if this is a concern.
- <li>It is possible to create invalid visibility values (for example "&|").  This will cause errors when the data is accessed.
- <li>Bulk imports do not effect the entry counts in the monitor page until the files are compacted.
-</ul>
-
-<h2>Best Practices</h2>
-
-<p>Consider two approaches to creating ingest files using map/reduce.
-
-<ol>
- <li>A large file containing the Key/Value pairs for only a single tablet.
- <li>A set of small files containing Key/Value pairs for every tablet.
-<ol>
-
-<p>In the first case, adding the file requires telling a single tablet server about a single file.  Even if the file
-is 20G in size, it is one call to the tablet server.  The tablet server makes one extra file entry in the
-tablet's metadata, and the data is now part of the tablet.
-
-<p>In the second case, an request must be made for each tablet for each file to be added.  If there
-100 files and 100 tablets, this will be 10K requests, and the number of files needed to be opened
-for scans on these tablets will be very large.  Major compactions will most likely start which will eventually 
-fix the problem, but a lot more work needs to be done by accumulo to read these files.
-
-<p>Getting good, fast, bulk import performance depends on creating files like the first, and avoiding files like
-the second.
-
-<p>For this reason, a RangePartitioner should be used to create files when
-writing with the AccumuloFileOutputFormat.
-
-<p>Hash partition is not recommended because it will put keys in random
-groups, exactly like our bad approach.
-
-<P>Any set of cut points for range partitioning can be used in a map
-reduce job, but using Accumulo's current splits is probably the most
-optimal thing to do.  However in some cases there may be too many
-splits.  For example if there are 2000 splits, you would need to run
-2001 reducers.  To overcome this problem use the
-<code>connector.tableOperations.getSplits(&lt;table name&gt;,&lt;max
-splits&gt;)</code> method.  This method will not return more than
-<code> &lt;max splits&gt; </code> splits, but the splits it returns
-will optimally partition the data for Accumulo.
-  
-<p>Remember that Accumulo never splits rows across tablets.
-Therefore the range partitioner only considers rows when partitioning.
-
-<p>When bulk importing many files into a new table, it might be good to pre-split the table to bring
-additional resources to accepting the data.  For example, if you know your data is indexed based on the
-date, pre-creating splits for each day will allow files to fall into natural splits.  Having more tablets
-accept the new data means that more resources can be used to import the data right away.
-
-<p>An alternative to bulk ingest is to have a map/reduce job use
-<code>AccumuloOutputFormat</code>, which can support billions of inserts per
-hour, depending on the size of your cluster. This is sufficient for
-most users, but bulk ingest remains the fastest way to incorporate
-data into Accumulo.  In addition, bulk ingest has one advantage over
-AccumuloOutputFormat: there is no duplicate data insertion.  When one uses
-map/reduce to output data to accumulo, restarted jobs may re-enter
-data from previous failed attempts. Generally, this only matters when
-there are aggregators. With bulk ingest, reducers are writing to new
-map files, so it does not matter. If a reduce fails, you create a new
-map file.  When all reducers finish, you bulk ingest the map files
-into Accumulo.  The disadvantage to bulk ingest over <code>AccumuloOutputFormat</code> is 
-greater latency: the entire map/reduce job must complete
-before any data is available.
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/combiners.html
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/resources/docs/combiners.html b/server/monitor/src/main/resources/docs/combiners.html
deleted file mode 100644
index cf18e05..0000000
--- a/server/monitor/src/main/resources/docs/combiners.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<html>
-<head>
-<title>Accumulo Combiners</title>
-<link rel='stylesheet' type='text/css' href='documentation.css' media='screen'/>
-</head>
-<body>
-
-<h1>Apache Accumulo Documentation : Combiners</h1>
-
-<p>Accumulo supports on the fly lazy aggregation of data using Combiners.  Aggregation is done at compaction and scan time.  No lookup is done at insert time, which` greatly speeds up ingest. 
-
-<p>Combiners are easy to use.  You use the setiters command to configure a combiner for a table.  Allowing a Combiner to apply to a whole column family is an interesting twist that gives the user great flexibility.  The example below demonstrates this flexibility.  
-
-<p><pre>
-
-Shell - Apache Accumulo Interactive Shell
-- version: 1.5.0
-- instance id: 863fc0d1-3623-4b6c-8c23-7d4fdb1c8a49
-- 
-- type 'help' for a list of available commands
--
-user@instance&gt; createtable perDayCounts
-user@instance perDayCounts&gt; setiter -t perDayCounts -p 10 -scan -minc -majc -n daycount -class org.apache.accumulo.core.iterators.user.SummingCombiner
-TypedValueCombiner can interpret Values as a variety of number encodings (VLong, Long, or String) before combining
-----------&gt; set SummingCombiner parameter columns, &lt;col fam&gt;[:&lt;col qual&gt;]{,&lt;col fam&gt;[:&lt;col qual&gt;]} escape non aplhanum chars using %&lt;hex&gt;.: day
-----------&gt; set SummingCombiner parameter type, &lt;VARNUM|LONG|STRING&gt;: STRING
-user@instance perDayCounts&gt; insert foo day 20080101 1
-user@instance perDayCounts&gt; insert foo day 20080101 1
-user@instance perDayCounts&gt; insert foo day 20080103 1
-user@instance perDayCounts&gt; insert bar day 20080101 1
-user@instance perDayCounts&gt; insert bar day 20080101 1
-user@instance perDayCounts&gt; scan
-bar day:20080101 []    2
-foo day:20080101 []    2
-foo day:20080103 []    1
-</pre>
-
-
-<p>Implementing a new Combiner is a snap.  Simply write some Java code that extends <a href='apidocs/org/apache/accumulo/core/iterators/Combiner.html'>org.apache.accumulo.core.iterators.Combiner</a>. A good place to look for examples is the <a href='apidocs/org/apache/accumulo/core/iterators/user/package-summary.html'>org.apache.accumulo.core.iterators.user</a> package.  Also look at the example StatsCombiner.     
-
-<p>To deploy a new aggregator, jar it up and put the jar in accumulo/lib/ext.  To see an example look at <a href='examples/README.combiner'>README.combiner</a>
-
-<p>If you would like to see what iterators a table has you can use the config command like in the following example.
-
-<p><pre>
-user@instance perDayCounts&gt; config -t perDayCounts -f iterator
----------+---------------------------------------------+-----------------------------------------------------------
-SCOPE    | NAME                                        | VALUE
----------+---------------------------------------------+-----------------------------------------------------------
-table    | table.iterator.majc.daycount .............. | 10,org.apache.accumulo.core.iterators.user.SummingCombiner
-table    | table.iterator.majc.daycount.opt.columns .. | day
-table    | table.iterator.majc.daycount.opt.type ..... | STRING
-table    | table.iterator.majc.vers .................. | 20,org.apache.accumulo.core.iterators.VersioningIterator
-table    | table.iterator.majc.vers.opt.maxVersions .. | 1
-table    | table.iterator.minc.daycount .............. | 10,org.apache.accumulo.core.iterators.user.SummingCombiner
-table    | table.iterator.minc.daycount.opt.columns .. | day
-table    | table.iterator.minc.daycount.opt.type ..... | STRING
-table    | table.iterator.minc.vers .................. | 20,org.apache.accumulo.core.iterators.VersioningIterator
-table    | table.iterator.minc.vers.opt.maxVersions .. | 1
-table    | table.iterator.scan.daycount .............. | 10,org.apache.accumulo.core.iterators.user.SummingCombiner
-table    | table.iterator.scan.daycount.opt.columns .. | day
-table    | table.iterator.scan.daycount.opt.type ..... | STRING
-table    | table.iterator.scan.vers .................. | 20,org.apache.accumulo.core.iterators.VersioningIterator
-table    | table.iterator.scan.vers.opt.maxVersions .. | 1
----------+---------------------------------------------+-----------------------------------------------------------
-</pre>
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/constraints.html
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/resources/docs/constraints.html b/server/monitor/src/main/resources/docs/constraints.html
deleted file mode 100644
index b227ed7..0000000
--- a/server/monitor/src/main/resources/docs/constraints.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<html>
-<head>
-<title>Accumulo Constraints</title>
-<link rel='stylesheet' type='text/css' href='documentation.css' media='screen'/>
-</head>
-<body>
-
-<h1>Apache Accumulo Documentation : Constraints</h1>
-
-Accumulo supports constraints.  Constraints are applied to mutations at ingest time.  
-
-<p>Implementing a new constraint is a snap.  Simply write some Java code that implements <a href='apidocs/org/apache/accumulo/core/constraints/Constraint.html'>org.apache.accumulo.core.constraints.Constraint</a>.     
-
-<p>To deploy a new constraint, jar it up and put the jar in accumulo/lib/ext.
-
-<p>After creating a constraint, set a table specific property to use it.  The following example adds two constraints to table foo. In the example com.test.ExampleConstraint and com.test.AnotherConstraint are class names.
-
-<p><pre>
-user@instance:9999 perDayCounts&gt; createtable foo
-user@instance:9999 foo&gt; config -t foo -s table.constraint.1=com.test.ExampleConstraint
-user@instance:9999 foo&gt; config -t foo -s table.constraint.2=com.test.AnotherConstraint
-user@instance:9999 foo&gt; config -t foo -f constraint
----------+------------------------------------------+-----------------------------------------
-SCOPE    | NAME                                     | VALUE
----------+------------------------------------------+-----------------------------------------
-table    | table.constraint.1...................... | com.test.ExampleConstraint
-table    | table.constraint.2...................... | com.test.AnotherConstraint
----------+------------------------------------------+-----------------------------------------
-user@instance:9999 foo&gt; 
-</pre>
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/distributedTracing.html
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/resources/docs/distributedTracing.html b/server/monitor/src/main/resources/docs/distributedTracing.html
deleted file mode 100644
index 5d363f3..0000000
--- a/server/monitor/src/main/resources/docs/distributedTracing.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<html>
-<head>
-<title>Accumulo Distributed Tracing</title>
-<link rel='stylesheet' type='text/css' href='documentation.css' media='screen'/>
-</head>
-<body>
-
-<h1>Apache Accumulo Documentation : Distributed Tracing</h1>
-
-<p>It can be difficult to determine why some operations are taking longer than expected.  For example, you may be looking up items with 
-very low latency, but sometimes the lookups take much longer.  Determining the cause of the delay is difficult because the system is 
-distributed, and the typical lookup is fast.</p>
-
-<p>To provide insight into what accumulo is doing during your scan, you can turn on tracing before you do your operation:</p>
-
-<pre>
-   DistributedTrace.enable(instance, zooReader, hostname, "myApplication");
-   Trace scanTrace = Trace.on("client:scan");
-   BatchScanner scanner = conn.createBatchScanner(...);
-   // Configure your scanner
-   for (Entry<Key, Value> entry : scanner) {
-   }
-   Trace.off();
-</pre>
-
-
-<p>Accumulo has been instrumented to record the time that various operations take when tracing is turned on.  The fact that tracing is 
-enabled follows all the requests made on behalf of the user throughout the distributed infrastructure of accumulo, and across all 
-threads of execution.</p>
-
-<p>These time spans will be inserted into the trace accumulo table.  You can browse recent traces from the accumulo monitor page.  
-You can also read the trace table directly.</p>
-
-<p>Tracing is supported in the shell.  For example:
-
-<pre>
-root@test&gt; createtable test
-root@test test&gt; insert a b c d
-root@test test&gt; trace on              
-root@test test&gt; scan
-a b:c []    d
-root@test test&gt; trace off
-Waiting for trace information
-Waiting for trace information
-Waiting for trace information
-Trace started at 2011/03/16 09:20:31.387
-Time  Start  Service@Location       Name
- 3355+0      shell@host2 shell:root
-    1+1        shell@host2 client:listUsers
-    1+1434     tserver@host2 getUserAuthorizations
-    1+1434     shell@host2 client:getUserAuthorizations
-   10+1550     shell@host2 scan
-    9+1551       shell@host2 scan:location
-    7+1552         shell@host2 client:startScan
-    6+1553         tserver@host2 startScan
-    5+1553           tserver@host2 tablet read ahead 11
-    1+1559         shell@host2 client:closeScan
-    1+1561     shell@host2 client:listUsers
-</pre>
-
-<p>Here we can see that the shell is getting the list of users (which is used for tab-completion) after every command.  While
-unexpected, it is a fast operation.  In fact, all the requests are very fast, and most of the time is spent waiting for the user
-to make a request while tracing is turned on.</p>
-
-<p>Spans are added to the trace table asynchronously.  The user may have to wait several seconds for all requests to complete before the 
-trace information is complete.</p>
-
-<p>You can extract the trace data out of the trace table.  Each span is a stored as a column in a row named for the trace id. 
-The following code will print out a trace:</p>
-
-<pre>
-String table = AccumuloConfiguration.getSystemConfiguration().get(Property.TRACE_TABLE);
-Scanner scanner = shellState.connector.createScanner(table, auths);
-scanner.setRange(new Range(new Text(Long.toHexString(scanTrace.traceId()))));
-TraceDump.printTrace(scanner, new Printer() {
-    void print(String line) {
-        System.out.println(line);
-    }
-});
-</pre>
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/documentation.css
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/resources/docs/documentation.css b/server/monitor/src/main/resources/docs/documentation.css
deleted file mode 100644
index 99ed599..0000000
--- a/server/monitor/src/main/resources/docs/documentation.css
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-html, body {
-    font-size: 10pt;
-    font-family: verdana, arial;
-}
-
-h1 {
-    font-size: 1.7em;
-    font-variant: small-caps;
-    text-align: left;
-}
-
-h2 {
-    font-size: 1.3em; 
-    text-align: left;
-}
-
-.highlight {
-    background-color: rgb(206,244,181);
-}
-
-.deprecated {
-    text-decoration: line-through;
-}
-
-table {
-    min-width: 60%;
-    border: 1px #333333 solid;
-    border-spacing-top: 0;
-    border-spacing-bottom: 0;
-    border: 1px #333333 solid;
-    border: 1px #333333 solid;
-}
-
-th {
-    border-top: 0;
-    border-bottom: 3px #333333 solid;
-    border-left: 1px #333333 dotted;
-    border-right: 0;
-    border-spacing-top: 0;
-    border-spacing-bottom: 0;
-    text-align: center;
-    font-variant: small-caps;
-    padding-left: 0.1em;
-    padding-right: 0.1em;
-    padding-top: 0.2em;
-    padding-bottom: 0.2em;
-    vertical-align: bottom;
-}
-
-td {
-    border-top: 0;
-    border-bottom: 0;
-    border-left: 0;
-    border-right: 0;
-    border-spacing-top: 0;
-    border-spacing-bottom: 0;
-    padding-left: 0.05em;
-    padding-right: 0.05em;
-    padding-top: 0.15em;
-    padding-bottom: 0.15em;
-}
-
-thead {
-    color: rgb(66,114,185);
-    text-align: center;
-    text-weight: bold;
-}
-
-td {
-    font-size: 10pt;
-    text-align:left;
-    padding-left:7pt;
-    padding-right:7pt;
-}
-
-pre {
-    font-size: 9pt;
-}
-
-a {
-    text-decoration: none;
-    color: #0000ff;
-    line-height: 1.5em;
-}
-
-a:hover {
-    color: #004400;
-    text-decoration: underline;
-}
-
-.large {
-    font-size: 1.5em;
-    font-variant: small-caps;
-    text-align: left;
-}
-

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/examples/README
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/resources/docs/examples/README b/server/monitor/src/main/resources/docs/examples/README
deleted file mode 100644
index 0aad866..0000000
--- a/server/monitor/src/main/resources/docs/examples/README
+++ /dev/null
@@ -1,95 +0,0 @@
-Title: Apache Accumulo Examples
-Notice:    Licensed to the Apache Software Foundation (ASF) under one
-           or more contributor license agreements.  See the NOTICE file
-           distributed with this work for additional information
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-           .
-             http://www.apache.org/licenses/LICENSE-2.0
-           .
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.
-
-Before running any of the examples, the following steps must be performed.
-
-1. Install and run Accumulo via the instructions found in $ACCUMULO_HOME/README.
-   Remember the instance name.  It will be referred to as "instance" throughout 
-   the examples. A comma-separated list of zookeeper servers will be referred 
-   to as "zookeepers".
-
-2. Create an Accumulo user (see the [user manual][1]), or use the root user.
-   The "username" Accumulo user name with password "password" is used 
-   throughout the examples. This user needs the ability to create tables.
-
-In all commands, you will need to replace "instance", "zookeepers", 
-"username", and "password" with the values you set for your Accumulo instance.
-
-Commands intended to be run in bash are prefixed by '$'.  These are always 
-assumed to be run from the $ACCUMULO_HOME directory.
-
-Commands intended to be run in the Accumulo shell are prefixed by '>'.
-
-Each README in the examples directory highlights the use of particular 
-features of Apache Accumulo.
-
-   README.batch:       Using the batch writer and batch scanner.
-
-   README.bloom:       Creating a bloom filter enabled table to increase query 
-                       performance.
-
-   README.bulkIngest:  Ingesting bulk data using map/reduce jobs on Hadoop.
-
-   README.classpath:   Using per-table classpaths.
-
-   README.client:      Using table operations, reading and writing data in Java.
-
-   README.combiner:    Using example StatsCombiner to find min, max, sum, and 
-                       count.
-
-   README.constraints: Using constraints with tables.
-
-   README.dirlist:     Storing filesystem information.
-
-   README.export:      Exporting and importing tables.
-
-   README.filedata:    Storing file data.
-
-   README.filter:      Using the AgeOffFilter to remove records more than 30 
-                       seconds old.
-
-   README.helloworld:  Inserting records both inside map/reduce jobs and 
-                       outside. And reading records between two rows.
-
-   README.isolation:   Using the isolated scanner to ensure partial changes 
-                       are not seen.
-
-   README.mapred:      Using MapReduce to read from and write to Accumulo 
-                       tables.
-
-   README.maxmutation: Limiting mutation size to avoid running out of memory.
-
-   README.regex:       Using MapReduce and Accumulo to find data using regular
-                       expressions.
-
-   README.rowhash:     Using MapReduce to read a table and write to a new 
-                       column in the same table.
-
-   README.shard:       Using the intersecting iterator with a term index 
-                       partitioned by document.
-
-   README.tabletofile: Using MapReduce to read a table and write one of its
-                       columns to a file in HDFS.
-
-   README.terasort:    Generating random data and sorting it using Accumulo.  
-
-   README.visibility:  Using visibilities (or combinations of authorizations). 
-                       Also shows user permissions.
-
-
-[1]: /1.5/user_manual/Accumulo_Shell.html#User_Administration

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/examples/README.batch
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/resources/docs/examples/README.batch b/server/monitor/src/main/resources/docs/examples/README.batch
deleted file mode 100644
index e78e808..0000000
--- a/server/monitor/src/main/resources/docs/examples/README.batch
+++ /dev/null
@@ -1,55 +0,0 @@
-Title: Apache Accumulo Batch Writing and Scanning Example
-Notice:    Licensed to the Apache Software Foundation (ASF) under one
-           or more contributor license agreements.  See the NOTICE file
-           distributed with this work for additional information
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-           .
-             http://www.apache.org/licenses/LICENSE-2.0
-           .
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.
-
-This tutorial uses the following Java classes, which can be found in org.apache.accumulo.examples.simple.client in the examples-simple module:
-
- * SequentialBatchWriter.java - writes mutations with sequential rows and random values
- * RandomBatchWriter.java - used by SequentialBatchWriter to generate random values
- * RandomBatchScanner.java - reads random rows and verifies their values
-
-This is an example of how to use the batch writer and batch scanner. To compile
-the example, run maven and copy the produced jar into the accumulo lib dir.
-This is already done in the tar distribution. 
-
-Below are commands that add 10000 entries to accumulo and then do 100 random
-queries.  The write command generates random 50 byte values. 
-
-Be sure to use the name of your instance (given as instance here) and the appropriate 
-list of zookeeper nodes (given as zookeepers here).
-
-Before you run this, you must ensure that the user you are running has the
-"exampleVis" authorization. (you can set this in the shell with "setauths -u username -s exampleVis")
-
-    $ ./bin/accumulo shell -u root -e "setauths -u username -s exampleVis"
-
-You must also create the table, batchtest1, ahead of time. (In the shell, use "createtable batchtest1")
-
-    $ ./bin/accumulo shell -u username -e "createtable batchtest1"
-    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.SequentialBatchWriter -i instance -z zookeepers -u username -p password -t batchtest1 --start 0 --num 10000 --size 50 --batchMemory 20M --batchLatency 500 --batchThreads 20 --vis exampleVis
-    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchScanner -i instance -z zookeepers -u username -p password -t batchtest1 --num 100 --min 0 --max 10000 --size 50 --scanThreads 20 --vis exampleVis
-    07 11:33:11,103 [client.CountingVerifyingReceiver] INFO : Generating 100 random queries...
-    07 11:33:11,112 [client.CountingVerifyingReceiver] INFO : finished
-    07 11:33:11,260 [client.CountingVerifyingReceiver] INFO : 694.44 lookups/sec   0.14 secs
-    
-    07 11:33:11,260 [client.CountingVerifyingReceiver] INFO : num results : 100
-    
-    07 11:33:11,364 [client.CountingVerifyingReceiver] INFO : Generating 100 random queries...
-    07 11:33:11,370 [client.CountingVerifyingReceiver] INFO : finished
-    07 11:33:11,416 [client.CountingVerifyingReceiver] INFO : 2173.91 lookups/sec   0.05 secs
-    
-    07 11:33:11,416 [client.CountingVerifyingReceiver] INFO : num results : 100

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/examples/README.bloom
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/resources/docs/examples/README.bloom b/server/monitor/src/main/resources/docs/examples/README.bloom
deleted file mode 100644
index a7330da..0000000
--- a/server/monitor/src/main/resources/docs/examples/README.bloom
+++ /dev/null
@@ -1,219 +0,0 @@
-Title: Apache Accumulo Bloom Filter Example
-Notice:    Licensed to the Apache Software Foundation (ASF) under one
-           or more contributor license agreements.  See the NOTICE file
-           distributed with this work for additional information
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-           .
-             http://www.apache.org/licenses/LICENSE-2.0
-           .
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.
-
-This example shows how to create a table with bloom filters enabled.  It also
-shows how bloom filters increase query performance when looking for values that
-do not exist in a table.
-
-Below table named bloom_test is created and bloom filters are enabled.
-
-    $ ./bin/accumulo shell -u username -p password
-    Shell - Apache Accumulo Interactive Shell
-    - version: 1.5.0
-    - instance name: instance
-    - instance id: 00000000-0000-0000-0000-000000000000
-    - 
-    - type 'help' for a list of available commands
-    - 
-    username@instance> setauths -u username -s exampleVis
-    username@instance> createtable bloom_test
-    username@instance bloom_test> config -t bloom_test -s table.bloom.enabled=true
-    username@instance bloom_test> exit
-
-Below 1 million random values are inserted into accumulo.  The randomly
-generated rows range between 0 and 1 billion.  The random number generator is
-initialized with the seed 7.
-
-    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchWriter --seed 7 -i instance -z zookeepers -u username -p password -t bloom_test --num 1000000 -min 0 -max 1000000000 -valueSize 50 -batchMemory 2M -batchLatency 60s -batchThreads 3 --vis exampleVis
-
-Below the table is flushed:
-
-    $ ./bin/accumulo shell -u username -p password -e 'flush -t bloom_test -w'
-    05 10:40:06,069 [shell.Shell] INFO : Flush of table bloom_test completed.
-
-After the flush completes, 500 random queries are done against the table.  The
-same seed is used to generate the queries, therefore everything is found in the
-table.
-
-    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchScanner --seed 7 -i instance -z zookeepers -u username -p password -t bloom_test --num 500 --min 0 --max 1000000000 --size 50 -batchThreads 20 --vis exampleVis
-    Generating 500 random queries...finished
-    96.19 lookups/sec   5.20 secs
-    num results : 500
-    Generating 500 random queries...finished
-    102.35 lookups/sec   4.89 secs
-    num results : 500
-
-Below another 500 queries are performed, using a different seed which results
-in nothing being found.  In this case the lookups are much faster because of
-the bloom filters.
-
-    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchScanner --seed 8 -i instance -z zookeepers -u username -p password -t bloom_test --num 500 --min 0 --max 1000000000 --size 50 -batchThreads 20 -auths exampleVis
-    Generating 500 random queries...finished
-    2212.39 lookups/sec   0.23 secs
-    num results : 0
-    Did not find 500 rows
-    Generating 500 random queries...finished
-    4464.29 lookups/sec   0.11 secs
-    num results : 0
-    Did not find 500 rows
-
-********************************************************************************
-
-Bloom filters can also speed up lookups for entries that exist.  In accumulo
-data is divided into tablets and each tablet has multiple map files. Every
-lookup in accumulo goes to a specific tablet where a lookup is done on each
-map file in the tablet.  So if a tablet has three map files, lookup performance
-can be three times slower than a tablet with one map file.  However if the map
-files contain unique sets of data, then bloom filters can help eliminate map
-files that do not contain the row being looked up.  To illustrate this two
-identical tables were created using the following process.  One table had bloom
-filters, the other did not.  Also the major compaction ratio was increased to
-prevent the files from being compacted into one file.
-
- * Insert 1 million entries using  RandomBatchWriter with a seed of 7
- * Flush the table using the shell
- * Insert 1 million entries using  RandomBatchWriter with a seed of 8
- * Flush the table using the shell
- * Insert 1 million entries using  RandomBatchWriter with a seed of 9
- * Flush the table using the shell
-
-After following the above steps, each table will have a tablet with three map
-files.  Flushing the table after each batch of inserts will create a map file.
-Each map file will contain 1 million entries generated with a different seed.
-This is assuming that Accumulo is configured with enough memory to hold 1
-million inserts.  If not, then more map files will be created. 
-
-The commands for creating the first table without bloom filters are below.
-
-    $ ./bin/accumulo shell -u username -p password
-    Shell - Apache Accumulo Interactive Shell
-    - version: 1.5.0
-    - instance name: instance
-    - instance id: 00000000-0000-0000-0000-000000000000
-    - 
-    - type 'help' for a list of available commands
-    - 
-    username@instance> setauths -u username -s exampleVis
-    username@instance> createtable bloom_test1
-    username@instance bloom_test1> config -t bloom_test1 -s table.compaction.major.ratio=7
-    username@instance bloom_test1> exit
-
-    $ ARGS="-i instance -z zookeepers -u username -p password -t bloom_test1 --num 1000000 --min 0 --max 1000000000 --size 50 --batchMemory 2M --batchLatency 60s --batchThreads 3 --auths exampleVis"
-    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchWriter --seed 7 $ARGS
-    $ ./bin/accumulo shell -u username -p password -e 'flush -t bloom_test1 -w'
-    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchWriter --seed 8 $ARGS
-    $ ./bin/accumulo shell -u username -p password -e 'flush -t bloom_test1 -w'
-    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchWriter --seed 9 $ARGS
-    $ ./bin/accumulo shell -u username -p password -e 'flush -t bloom_test1 -w'
-
-The commands for creating the second table with bloom filers are below.
-
-    $ ./bin/accumulo shell -u username -p password
-    Shell - Apache Accumulo Interactive Shell
-    - version: 1.5.0
-    - instance name: instance
-    - instance id: 00000000-0000-0000-0000-000000000000
-    - 
-    - type 'help' for a list of available commands
-    - 
-    username@instance> setauths -u username -s exampleVis
-    username@instance> createtable bloom_test2
-    username@instance bloom_test2> config -t bloom_test2 -s table.compaction.major.ratio=7
-    username@instance bloom_test2> config -t bloom_test2 -s table.bloom.enabled=true
-    username@instance bloom_test2> exit
-
-    $ ARGS="-i instance -z zookeepers -u username -p password -t bloom_test2 --num 1000000 --min 0 --max 1000000000 --size 50 --batchMemory 2M --batchLatency 60s --batchThreads 3 --auths exampleVis"
-    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchWriter --seed 7 $ARGS
-    $ ./bin/accumulo shell -u username -p password -e 'flush -t bloom_test2 -w'
-    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchWriter --seed 8 $ARGS
-    $ ./bin/accumulo shell -u username -p password -e 'flush -t bloom_test2 -w'
-    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchWriter --seed 9 $ARGS
-    $ ./bin/accumulo shell -u username -p password -e 'flush -t bloom_test2 -w'
-
-Below 500 lookups are done against the table without bloom filters using random
-NG seed 7.  Even though only one map file will likely contain entries for this
-seed, all map files will be interrogated.
-
-    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchScanner --seed 7 -i instance -z zookeepers -u username -p password -t bloom_test1 --num 500 --min 0 --max 1000000000 --size 50 --scanThreads 20 --auths exampleVis
-    Generating 500 random queries...finished
-    35.09 lookups/sec  14.25 secs
-    num results : 500
-    Generating 500 random queries...finished
-    35.33 lookups/sec  14.15 secs
-    num results : 500
-
-Below the same lookups are done against the table with bloom filters.  The
-lookups were 2.86 times faster because only one map file was used, even though three
-map files existed.
-
-    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchScanner --seed 7 -i instance -z zookeepers -u username -p password -t bloom_test2 --num 500 --min 0 --max 1000000000 --size 50 -scanThreads 20 --auths exampleVis
-    Generating 500 random queries...finished
-    99.03 lookups/sec   5.05 secs
-    num results : 500
-    Generating 500 random queries...finished
-    101.15 lookups/sec   4.94 secs
-    num results : 500
-
-You can verify the table has three files by looking in HDFS.  To look in HDFS
-you will need the table ID, because this is used in HDFS instead of the table
-name.  The following command will show table ids.
-
-    $ ./bin/accumulo shell -u username -p password -e 'tables -l'
-    accumulo.metadata    =>        !0
-    accumulo.root        =>        +r
-    bloom_test1          =>        o7
-    bloom_test2          =>        o8
-    trace                =>         1
-
-So the table id for bloom_test2 is o8.  The command below shows what files this
-table has in HDFS.  This assumes Accumulo is at the default location in HDFS. 
-
-    $ hadoop fs -lsr /accumulo/tables/o8
-    drwxr-xr-x   - username supergroup          0 2012-01-10 14:02 /accumulo/tables/o8/default_tablet
-    -rw-r--r--   3 username supergroup   52672650 2012-01-10 14:01 /accumulo/tables/o8/default_tablet/F00000dj.rf
-    -rw-r--r--   3 username supergroup   52436176 2012-01-10 14:01 /accumulo/tables/o8/default_tablet/F00000dk.rf
-    -rw-r--r--   3 username supergroup   52850173 2012-01-10 14:02 /accumulo/tables/o8/default_tablet/F00000dl.rf
-
-Running the rfile-info command shows that one of the files has a bloom filter
-and its 1.5MB.
-
-    $ ./bin/accumulo rfile-info /accumulo/tables/o8/default_tablet/F00000dj.rf
-    Locality group         : <DEFAULT>
-	Start block          : 0
-	Num   blocks         : 752
-	Index level 0        : 43,598 bytes  1 blocks
-	First key            : row_0000001169 foo:1 [exampleVis] 1326222052539 false
-	Last key             : row_0999999421 foo:1 [exampleVis] 1326222052058 false
-	Num entries          : 999,536
-	Column families      : [foo]
-
-    Meta block     : BCFile.index
-      Raw size             : 4 bytes
-      Compressed size      : 12 bytes
-      Compression type     : gz
-
-    Meta block     : RFile.index
-      Raw size             : 43,696 bytes
-      Compressed size      : 15,592 bytes
-      Compression type     : gz
-
-    Meta block     : acu_bloom
-      Raw size             : 1,540,292 bytes
-      Compressed size      : 1,433,115 bytes
-      Compression type     : gz
-

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/examples/README.bulkIngest
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/resources/docs/examples/README.bulkIngest b/server/monitor/src/main/resources/docs/examples/README.bulkIngest
deleted file mode 100644
index 0e049b3..0000000
--- a/server/monitor/src/main/resources/docs/examples/README.bulkIngest
+++ /dev/null
@@ -1,33 +0,0 @@
-Title: Apache Accumulo Bulk Ingest Example
-Notice:    Licensed to the Apache Software Foundation (ASF) under one
-           or more contributor license agreements.  See the NOTICE file
-           distributed with this work for additional information
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-           .
-             http://www.apache.org/licenses/LICENSE-2.0
-           .
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.
-
-This is an example of how to bulk ingest data into accumulo using map reduce.
-
-The following commands show how to run this example.  This example creates a
-table called test_bulk which has two initial split points. Then 1000 rows of
-test data are created in HDFS. After that the 1000 rows are ingested into
-accumulo.  Then we verify the 1000 rows are in accumulo. 
-
-    $ PKG=org.apache.accumulo.examples.simple.mapreduce.bulk
-    $ ARGS="-i instance -z zookeepers -u username -p password"
-    $ ./bin/accumulo $PKG.SetupTable $ARGS -t test_bulk row_00000333 row_00000666
-    $ ./bin/accumulo $PKG.GenerateTestData --start-row 0 --count 1000 --output bulk/test_1.txt
-    $ ./bin/tool.sh lib/accumulo-examples-simple.jar $PKG.BulkIngestExample $ARGS -t test_bulk --inputDir bulk --workDir tmp/bulkWork
-    $ ./bin/accumulo $PKG.VerifyIngest $ARGS -t test_bulk --start-row 0 --count 1000
-
-For a high level discussion of bulk ingest, see the docs dir.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/examples/README.classpath
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/resources/docs/examples/README.classpath b/server/monitor/src/main/resources/docs/examples/README.classpath
deleted file mode 100644
index e816222..0000000
--- a/server/monitor/src/main/resources/docs/examples/README.classpath
+++ /dev/null
@@ -1,68 +0,0 @@
-Title: Apache Accumulo Classpath Example
-Notice:    Licensed to the Apache Software Foundation (ASF) under one
-           or more contributor license agreements.  See the NOTICE file
-           distributed with this work for additional information
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-           .
-             http://www.apache.org/licenses/LICENSE-2.0
-           .
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.
-
-
-This example shows how to use per table classpaths.   The example leverages a
-test jar which contains a Filter that supresses rows containing "foo".  The
-example shows copying the FooFilter.jar into HDFS and then making an Accumulo
-table reference that jar.
-
-
-Execute the following command in the shell.
-
-    $ hadoop fs -copyFromLocal $ACCUMULO_HOME/test/src/test/resources/FooFilter.jar /user1/lib
-
-Execute following in Accumulo shell to setup classpath context
-
-    root@test15> config -s general.vfs.context.classpath.cx1=hdfs://<namenode host>:<namenode port>/user1/lib
-
-Create a table
-
-    root@test15> createtable nofoo
-
-The following command makes this table use the configured classpath context
-
-    root@test15 nofoo> config -t nofoo -s table.classpath.context=cx1
-
-The following command configures an iterator thats in FooFilter.jar
-
-    root@test15 nofoo> setiter -n foofilter -p 10 -scan -minc -majc -class org.apache.accumulo.test.FooFilter
-    Filter accepts or rejects each Key/Value pair
-    ----------> set FooFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method: false
-
-The commands below show the filter is working.
-
-    root@test15 nofoo> insert foo1 f1 q1 v1
-    root@test15 nofoo> insert noo1 f1 q1 v2
-    root@test15 nofoo> scan
-    noo1 f1:q1 []    v2
-    root@test15 nofoo> 
-
-Below, an attempt is made to add the FooFilter to a table thats not configured
-to use the clasppath context cx1.  This fails util the table is configured to
-use cx1.
-
-    root@test15 nofoo> createtable nofootwo
-    root@test15 nofootwo> setiter -n foofilter -p 10 -scan -minc -majc -class org.apache.accumulo.test.FooFilter
-    2013-05-03 12:49:35,943 [shell.Shell] ERROR: java.lang.IllegalArgumentException: org.apache.accumulo.test.FooFilter
-    root@test15 nofootwo> config -t nofootwo -s table.classpath.context=cx1
-    root@test15 nofootwo> setiter -n foofilter -p 10 -scan -minc -majc -class org.apache.accumulo.test.FooFilter
-    Filter accepts or rejects each Key/Value pair
-    ----------> set FooFilter parameter negate, default false keeps k/v that pass accept method, true rejects k/v that pass accept method: false
-
-


Mime
View raw message