You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/04/10 19:51:24 UTC
svn commit: r1466594 - in /accumulo/trunk: ./ assemble/ core/
core/src/main/java/org/apache/accumulo/core/conf/
core/src/main/resources/org/apache/accumulo/core/conf/ docs/ examples/
fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/a...
Author: kturner
Date: Wed Apr 10 17:51:24 2013
New Revision: 1466594
URL: http://svn.apache.org/r1466594
Log:
ACCUMULO-1253 Fix build of docs/config.html; strike-through deprecated properties
Removed:
accumulo/trunk/assemble/docgen.sh
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/assemble/build.sh
accumulo/trunk/assemble/pom.xml
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
accumulo/trunk/core/src/main/resources/org/apache/accumulo/core/conf/config.html
accumulo/trunk/docs/documentation.css
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1465156-1465624,1465626,1465628-1465687,1465689-1466176,1466178-1466200,1466202,1466204-1466210,1466212-1466242,1466244-1466260,1466262-1466268,1466270-1466581,1466583-1466591
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1465156-1465624,1465626,1465628-1465687,1465689-1466176,1466178-1466200,1466202,1466204-1466210,1466212-1466242,1466244-1466260,1466262-1466268,1466270-1466581,1466583-1466591
Modified: accumulo/trunk/assemble/build.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/build.sh?rev=1466594&r1=1466593&r2=1466594&view=diff
==============================================================================
--- accumulo/trunk/assemble/build.sh (original)
+++ accumulo/trunk/assemble/build.sh Wed Apr 10 17:51:24 2013
@@ -46,7 +46,5 @@ if [ "$COUNT" -ne $EXPECTED ]
then
fail expected $EXPECTED files missing licenses, but saw "$COUNT"
fi
-#need to run mvn package twice to properly build docs/config.html
-run mvn package
run mvn package javadoc:aggregate javadoc:jar source:jar -Pdist
run mvn -P assemble
Modified: accumulo/trunk/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1466594&r1=1466593&r2=1466594&view=diff
==============================================================================
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Wed Apr 10 17:51:24 2013
@@ -73,13 +73,15 @@
<execution>
<id>config-webpage</id>
<goals>
- <goal>exec</goal>
+ <goal>java</goal>
</goals>
- <phase>package</phase>
+ <phase>prepare-package</phase>
<configuration>
- <executable>bash</executable>
+ <mainClass>org.apache.accumulo.core.conf.DefaultConfiguration</mainClass>
+ <classpathScope>compile</classpathScope>
<arguments>
- <argument>docgen.sh</argument>
+ <argument>--generate-doc</argument>
+ <argument>${project.build.directory}/../../docs/config.html</argument>
</arguments>
</configuration>
</execution>
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1465156-1465624,1465626,1465628-1465687,1465689-1466176,1466178-1466200,1466202,1466204-1466210,1466212-1466242,1466244-1466260,1466262-1466268,1466270-1466581,1466583-1466591
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java?rev=1466594&r1=1466593&r2=1466594&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java Wed Apr 10 17:51:24 2013
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.core.conf;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
@@ -55,7 +56,7 @@ public class DefaultConfiguration extend
private static void generateDocumentation(PrintStream doc) {
// read static content from resources and output
- InputStream data = DefaultConfiguration.class.getClassLoader().getResourceAsStream("config.html");
+ InputStream data = DefaultConfiguration.class.getResourceAsStream("config.html");
if (data != null) {
byte[] buffer = new byte[1024];
int n;
@@ -66,11 +67,11 @@ public class DefaultConfiguration extend
e.printStackTrace();
return;
} finally {
- try {
- data.close();
- } catch (IOException ex) {
- log .error(ex, ex);
- }
+ try {
+ data.close();
+ } catch (IOException ex) {
+ log.error(ex, ex);
+ }
}
}
doc.println();
@@ -80,46 +81,54 @@ public class DefaultConfiguration extend
for (Property prop : Property.values()) {
if (prop.isExperimental())
continue;
-
+
if (prop.getType().equals(PropertyType.PREFIX))
prefixes.add(prop);
else
sortedProps.put(prop.getKey(), prop);
}
- doc.println(" <p>Jump to: ");
+ int indentDepth = 2;
+ doc.println(indent(indentDepth++) + "<p>Jump to: ");
String delimiter = "";
for (Property prefix : prefixes) {
if (prefix.isExperimental())
continue;
-
+
doc.print(delimiter + "<a href='#" + prefix.name() + "'>" + prefix.getKey() + "*</a>");
delimiter = " | ";
}
- doc.println(" </p>");
+ doc.println(indent(--indentDepth) + "</p>");
- doc.println(" <table>");
+ doc.println(indent(indentDepth++) + "<table>");
for (Property prefix : prefixes) {
if (prefix.isExperimental())
continue;
-
- doc.println(" <tr><td colspan='5'><a name='" + prefix.name() + "' class='large'>" + prefix.getKey() + "*</a></td></tr>");
- doc.println(" <tr><td colspan='5'><i>" + prefix.getDescription() + "</i></td></tr>");
+
+ boolean isDeprecated = prefix.isDeprecated();
+
+ doc.println(indent(indentDepth) + "<tr><td colspan='5'" + (isDeprecated ? " class='deprecated'" : "") + "><a id='" + prefix.name() + "' class='large'>"
+ + prefix.getKey() + "*</a></td></tr>");
+ doc.println(indent(indentDepth) + "<tr><td colspan='5'" + (isDeprecated ? " class='deprecated'" : "") + "><i>"
+ + (isDeprecated ? "<b><i>Deprecated.</i></b> " : "") + prefix.getDescription() + "</i></td></tr>");
if (!prefix.equals(Property.TABLE_CONSTRAINT_PREFIX) && !prefix.equals(Property.TABLE_ITERATOR_PREFIX)
&& !prefix.equals(Property.TABLE_LOCALITY_GROUP_PREFIX))
- doc.println(" <tr><th>Property</th><th>Type</th><th>Zookeeper Mutable</th><th>Default Value</th><th>Description</th></tr>");
+ doc.println(indent(indentDepth) + "<tr><th>Property</th><th>Type</th><th>Zookeeper Mutable</th><th>Default Value</th><th>Description</th></tr>");
boolean highlight = true;
for (Property prop : sortedProps.values()) {
if (prop.isExperimental())
continue;
-
+
+ isDeprecated = prefix.isDeprecated() || prop.isDeprecated();
+
if (prop.getKey().startsWith(prefix.getKey())) {
- doc.println(" <tr " + (highlight ? "class='highlight'" : "") + ">");
+ doc.println(indent(indentDepth++) + "<tr" + (highlight ? " class='highlight'" : "") + ">");
highlight = !highlight;
- doc.println(" <td>" + prop.getKey() + "</td>");
- doc.println(" <td><b><a href='#" + prop.getType().name() + "'>" + prop.getType().toString().replaceAll(" ", " ") + "</a></b></td>");
+ doc.println(indent(indentDepth) + "<td" + (isDeprecated ? " class='deprecated'" : "") + ">" + prop.getKey() + "</td>");
+ doc.println(indent(indentDepth) + "<td" + (isDeprecated ? " class='deprecated'" : "") + "><b><a href='#" + prop.getType().name() + "'>"
+ + prop.getType().toString().replaceAll(" ", " ") + "</a></b></td>");
String zoo = "no";
if (Property.isValidZooPropertyKey(prop.getKey())) {
zoo = "yes";
@@ -127,39 +136,52 @@ public class DefaultConfiguration extend
zoo = "yes but requires restart of the " + prop.getKey().split("[.]")[0];
}
}
- doc.println(" <td>" + zoo + "</td>");
- doc.println(" <td><pre>" + (prop.getDefaultValue().isEmpty() ? " " : prop.getDefaultValue().replaceAll(" ", " ")) + "</pre></td>");
- doc.println(" <td>" + prop.getDescription() + "</td>");
- doc.println(" </tr>");
+ doc.println(indent(indentDepth) + "<td" + (isDeprecated ? " class='deprecated'" : "") + ">" + zoo + "</td>");
+ doc.println(indent(indentDepth) + "<td" + (isDeprecated ? " class='deprecated'" : "") + "><pre>"
+ + (prop.getDefaultValue().isEmpty() ? " " : prop.getDefaultValue().replaceAll(" ", " ")) + "</pre></td>");
+ doc.println(indent(indentDepth) + "<td" + (isDeprecated ? " class='deprecated'" : "") + ">" + (isDeprecated ? "<b><i>Deprecated.</i></b> " : "")
+ + prop.getDescription() + "</td>");
+ doc.println(indent(--indentDepth) + "</tr>");
}
}
}
- doc.println(" </table>");
+ doc.println(indent(--indentDepth) + "</table>");
- doc.println(" <h1>Property Type Descriptions</h1>");
- doc.println(" <table>");
- doc.println(" <tr><th>Property Type</th><th>Description</th></tr>");
+ doc.println(indent(indentDepth) + "<h1>Property Type Descriptions</h1>");
+ doc.println(indent(indentDepth++) + "<table>");
+ doc.println(indent(indentDepth) + "<tr><th>Property Type</th><th>Description</th></tr>");
boolean highlight = true;
for (PropertyType type : PropertyType.values()) {
if (type.equals(PropertyType.PREFIX))
continue;
- doc.println(" <tr " + (highlight ? "class='highlight'" : "") + ">");
+ doc.println(indent(indentDepth++) + "<tr " + (highlight ? "class='highlight'" : "") + ">");
highlight = !highlight;
- doc.println(" <td><h3><a name='" + type.name() + "'>" + type + "</a></td>");
- doc.println(" <td>" + type.getFormatDescription() + "</td>");
- doc.println(" </tr>");
- }
- doc.println(" </table>");
- doc.println(" </body>");
- doc.println("</html>");
+ doc.println(indent(indentDepth) + "<td><h3><a id='" + type.name() + "'>" + type + "</a></h3></td>");
+ doc.println(indent(indentDepth) + "<td>" + type.getFormatDescription() + "</td>");
+ doc.println(indent(--indentDepth) + "</tr>");
+ }
+ doc.println(indent(--indentDepth) + "</table>");
+ doc.println(indent(--indentDepth) + "</body>");
+ doc.println(indent(--indentDepth) + "</html>");
doc.close();
}
+ private static String indent(int depth) {
+ StringBuilder sb = new StringBuilder();
+ for (int d = 0; d < depth; d++)
+ sb.append(" ");
+ return sb.toString();
+ }
+
/*
* Generate documentation for conf/accumulo-site.xml file usage
*/
- public static void main(String[] args) {
- if (args.length == 1 && args[0].equals("--generate-doc"))
- generateDocumentation(System.out);
+ public static void main(String[] args) throws FileNotFoundException {
+ if (args.length == 2 && args[0].equals("--generate-doc")) {
+ generateDocumentation(new PrintStream(args[1]));
+ } else {
+ throw new IllegalArgumentException("Usage: " + DefaultConfiguration.class.getName() + " --generate-doc <filename>");
+ }
}
+
}
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1466594&r1=1466593&r2=1466594&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java Wed Apr 10 17:51:24 2013
@@ -17,6 +17,7 @@
package org.apache.accumulo.core.conf;
import java.io.File;
+import java.lang.annotation.Annotation;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
@@ -26,6 +27,7 @@ import org.apache.accumulo.core.util.for
import org.apache.accumulo.core.util.interpret.DefaultScanInterpreter;
import org.apache.accumulo.start.classloader.AccumuloClassLoader;
import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
+import org.apache.log4j.Logger;
public enum Property {
@@ -39,7 +41,10 @@ public enum Property {
"Fully qualified class name of the class that implements the CryptoModule interface, to be used in setting up encryption at rest for the WAL and (future) other parts of the code.",
true),
CRYPTO_CIPHER_SUITE("crypto.cipher.suite", "NullCipher", PropertyType.STRING, "Describes the cipher suite to use for the write-ahead log", true),
- CRYPTO_CIPHER_ALGORITHM_NAME("crypto.cipher.algorithm.name", "NullCipher", PropertyType.STRING,
+ CRYPTO_CIPHER_ALGORITHM_NAME(
+ "crypto.cipher.algorithm.name",
+ "NullCipher",
+ PropertyType.STRING,
"States the name of the algorithm used in the corresponding cipher suite. Do not make these different, unless you enjoy mysterious exceptions and bugs.",
true),
CRYPTO_CIPHER_KEY_LENGTH("crypto.cipher.key.length", "128", PropertyType.STRING,
@@ -105,8 +110,8 @@ public enum Property {
MASTER_THREADCHECK("master.server.threadcheck.time", "1s", PropertyType.TIMEDURATION, "The time between adjustments of the server thread pool."),
MASTER_RECOVERY_DELAY("master.recovery.delay", "10s", PropertyType.TIMEDURATION,
"When a tablet server's lock is deleted, it takes time for it to completely quit. This delay gives it time before log recoveries begin."),
- MASTER_WALOG_CLOSER_IMPLEMETATION("master.walog.closer.implementation", "org.apache.accumulo.server.master.recovery.HadoopLogCloser",
- PropertyType.CLASSNAME, "A class that implements a mechansim to steal write access to a file"),
+ MASTER_WALOG_CLOSER_IMPLEMETATION("master.walog.closer.implementation", "org.apache.accumulo.server.master.recovery.HadoopLogCloser", PropertyType.CLASSNAME,
+ "A class that implements a mechansim to steal write access to a file"),
MASTER_FATE_THREADPOOL_SIZE("master.fate.threadpool.size", "4", PropertyType.COUNT,
"The number of threads used to run FAult-Tolerant Executions. These are primarily table operations like merge."),
@@ -228,7 +233,8 @@ public enum Property {
TRACE_USER("trace.user", "root", PropertyType.STRING, "DEPRECATED SINCE 1.5, USE trace.principal. The name of the user to store distributed traces"),
TRACE_PRINCIPAL("trace.principal", "root", PropertyType.STRING, "The principal to store distributed traces"),
@Deprecated
- TRACE_PASSWORD("trace.password", "secret", PropertyType.STRING, "DEPRECATED SINCE 1.5, USE trace.login. The password for the user used to store distributed traces"),
+ TRACE_PASSWORD("trace.password", "secret", PropertyType.STRING,
+ "DEPRECATED SINCE 1.5, USE trace.login. The password for the user used to store distributed traces"),
TRACE_LOGIN_PROPERTIES("trace.login", null, PropertyType.PREFIX, "The login credentials prefix for the principal used to store distributed traces"),
// per table properties
@@ -339,15 +345,14 @@ public enum Property {
"Properties in this category are define a classpath. These properties start with the category prefix, followed by a context name. "
+ "The value is a comma seperated list of URIs. Supports full regex on filename alone. For example general.vfs.context.classpath.cx1=hdfs://nn1:9902/mylibdir/*.jar. "
+ "You can enable post delegation for a context, which will load classes from the context first instead of the parent first. "
- + "Do this by setting general.vfs.context.classpath.<name>.delegation=post, where <name> is your context name. "
+ + "Do this by setting general.vfs.context.classpath.<name>.delegation=post, where <name> is your context name. "
+ "If delegation is not specified, it defaults to loading from parent classloader first."),
- VFS_CLASSLOADER_CACHE_DIR(
- AccumuloVFSClassLoader.VFS_CACHE_DIR,
- new File(System.getProperty("java.io.tmpdir"), "accumulo-vfs-cache-" + System.getProperty("user.name", "nouser"))
- .getAbsolutePath(),
- PropertyType.ABSOLUTEPATH,
- "Directory to use for the vfs cache. The cache will keep a soft reference to all of the classes loaded in the VM. This should be on local disk on each node with sufficient space. It defaults to /tmp",
- false);
+ VFS_CLASSLOADER_CACHE_DIR(
+ AccumuloVFSClassLoader.VFS_CACHE_DIR,
+ new File(System.getProperty("java.io.tmpdir"), "accumulo-vfs-cache-" + System.getProperty("user.name", "nouser")).getAbsolutePath(),
+ PropertyType.ABSOLUTEPATH,
+ "Directory to use for the vfs cache. The cache will keep a soft reference to all of the classes loaded in the VM. This should be on local disk on each node with sufficient space. It defaults to /tmp",
+ false);
private String key, defaultValue, description;
private PropertyType type;
@@ -360,11 +365,12 @@ public enum Property {
this.type = type;
this.experimental = experimental;
}
-
+
private Property(String name, String defaultValue, PropertyType type, String description) {
this(name, defaultValue, type, description, false);
}
+ @Override
public String toString() {
return this.key;
}
@@ -388,7 +394,7 @@ public enum Property {
public boolean isExperimental() {
return experimental;
}
-
+
private static HashSet<String> validTableProperties = null;
private static HashSet<String> validProperties = null;
private static HashSet<String> validPrefixes = null;
@@ -469,4 +475,18 @@ public enum Property {
|| (key.startsWith(Property.TABLE_ITERATOR_PREFIX.getKey()) && key.substring(Property.TABLE_ITERATOR_PREFIX.getKey().length()).split("\\.").length == 2)
|| key.equals(Property.TABLE_LOAD_BALANCER.getKey());
}
+
+ public boolean isDeprecated() {
+ Logger log = Logger.getLogger(getClass());
+ try {
+ for (Annotation a : getClass().getField(name()).getAnnotations())
+ if (a instanceof Deprecated)
+ return true;
+ } catch (SecurityException e) {
+ log.error(e, e);
+ } catch (NoSuchFieldException e) {
+ log.error(e, e);
+ }
+ return false;
+ }
}
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java?rev=1466594&r1=1466593&r2=1466594&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java Wed Apr 10 17:51:24 2013
@@ -34,7 +34,7 @@ public enum PropertyType {
"A positive integer optionally followed by a unit of memory (whitespace disallowed), as in 2G.<br />"
+ "If no unit is specified, bytes are assumed. Valid units are 'B', 'K', 'M', 'G', for bytes, kilobytes, megabytes, and gigabytes.<br />"
+ "Examples of valid memories are '1024', '20B', '100K', '1500M', '2G'.<br />"
- + "Examples of invalid memories are '1M500K', '1M 2K', '1MB', '1.5G', '1,024K', '', and 'a'.<br .>"
+ + "Examples of invalid memories are '1M500K', '1M 2K', '1MB', '1.5G', '1,024K', '', and 'a'.<br />"
+ "Unless otherwise stated, the max value for the memory represented in bytes is " + Long.MAX_VALUE),
HOSTLIST("host list", "[\\w-]+(?:\\.[\\w-]+)*(?:\\:\\d{1,5})?(?:,[\\w-]+(?:\\.[\\w-]+)*(?:\\:\\d{1,5})?)*",
@@ -53,6 +53,7 @@ public enum PropertyType {
"A string that represents a filesystem path, which can be either relative or absolute to some directory. The filesystem depends on the property."),
ABSOLUTEPATH("absolute path", null,
"An absolute filesystem path. The filesystem depends on the property. This is the same as path, but enforces that its root is explicitly specified.") {
+ @Override
public boolean isValidFormat(String value) {
return new Path(value).isAbsolute();
}
@@ -75,6 +76,7 @@ public enum PropertyType {
this.regex = regex == null ? null : Pattern.compile(regex, Pattern.DOTALL);
}
+ @Override
public String toString() {
return shortname;
}
Modified: accumulo/trunk/core/src/main/resources/org/apache/accumulo/core/conf/config.html
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/resources/org/apache/accumulo/core/conf/config.html?rev=1466594&r1=1466593&r2=1466594&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/resources/org/apache/accumulo/core/conf/config.html (original)
+++ accumulo/trunk/core/src/main/resources/org/apache/accumulo/core/conf/config.html Wed Apr 10 17:51:24 2013
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Accumulo Configuration</title>
<link rel='stylesheet' type='text/css' href='documentation.css' media='screen'/>
@@ -27,22 +28,22 @@
below (from highest to lowest):</p>
<table>
<tr><th>Location</th><th>Description</th></tr>
- <tr class='highlight'><td><b>Zookeeper<br/>table properties</td>
+ <tr class='highlight'><td><b>Zookeeper<br/>table properties</b></td>
<td>Table properties are applied to the entire cluster when set in zookeeper using the accumulo API or shell. While table properties take precedent over system properties, both will override properties set in accumulo-site.xml<br/><br/>
Table properties consist of all properties with the table.* prefix. Table properties are configured on a per-table basis using the following shell commmand:
<pre>config -t TABLE -s PROPERTY=VALUE</pre></td>
</tr>
- <tr><td><b>Zookeeper<br/>system properties</td>
+ <tr><td><b>Zookeeper<br/>system properties</b></td>
<td>System properties are applied to the entire cluster when set in zookeeper using the accumulo API or shell. System properties consist of all properties with a 'yes' in the 'Zookeeper Mutable' column in the table below. They are set with the following shell command:
<pre>config -s PROPERTY=VALUE</pre>
If a table.* property is set using this method, the value will apply to all tables except those configured on per-table basis (which have higher precedence).<br/><br/>
While most system properties take effect immediately, some require a restart of the process which is indicated in 'Zookeeper Mutable'.</td>
</tr>
- <tr class='highlight'><td><b>accumulo-site.xml</td>
+ <tr class='highlight'><td><b>accumulo-site.xml</b></td>
<td>Accumulo processes (master, tserver, etc) read their local accumulo-site.xml on start up. Therefore, changes made to accumulo-site.xml must rsynced across the cluster and processes must be restarted to apply changes.<br/><br/>
Certain properties (indicated by a 'no' in 'Zookeeper Mutable') cannot be set in zookeeper and only set in this file. The accumulo-site.xml also allows you to configure tablet servers with different settings.</td>
</tr>
- <tr><td><b>Default</td>
+ <tr><td><b>Default</b></td>
<td>All properties have a default value in the source code. This value has the lowest precedence and is overriden if set in accumulo-site.xml or zookeeper.<br/><br/>While the default value is usually optimal, there are cases where a change can increase query and ingest performance.</td>
</tr>
</table>
Modified: accumulo/trunk/docs/documentation.css
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/documentation.css?rev=1466594&r1=1466593&r2=1466594&view=diff
==============================================================================
--- accumulo/trunk/docs/documentation.css (original)
+++ accumulo/trunk/docs/documentation.css Wed Apr 10 17:51:24 2013
@@ -34,6 +34,10 @@ h2 {
background-color: rgb(206,244,181);
}
+.deprecated {
+ text-decoration: line-through;
+}
+
table {
min-width: 60%;
border: 1px #333333 solid;
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1465156-1465624,1465626,1465628-1465687,1465689-1466176,1466178-1466200,1466202,1466204-1466210,1466212-1466242,1466244-1466260,1466262-1466268,1466270-1466581,1466583-1466591
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1465156-1465624,1465626,1465628-1465687,1465689-1466176,1466178-1466200,1466202,1466204-1466210,1466212-1466242,1466244-1466260,1466262-1466268,1466270-1466581,1466583-1466591
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1465156-1465624,1465626,1465628-1465687,1465689-1466176,1466178-1466200,1466202,1466204-1466210,1466212-1466242,1466244-1466260,1466262-1466268,1466270-1466581,1466583-1466591
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1465156-1465624,1465626,1465628-1465687,1465689-1466176,1466178-1466200,1466202,1466204-1466210,1466212-1466242,1466244-1466260,1466262-1466268,1466270-1466581,1466583-1466591
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1465156-1465624,1465626,1465628-1465687,1465689-1466176,1466178-1466200,1466202,1466204-1466210,1466212-1466242,1466244-1466260,1466262-1466268,1466270-1466581,1466583-1466591