You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2013/12/19 03:55:01 UTC
[01/10] git commit: ACCUMULO-2058 Add shell env interpolation for
ACCUMULO_CONF_DIR when extracting kerberos keytab value.
Updated Branches:
refs/heads/master ad676c1e9 -> 3be435e9f
ACCUMULO-2058 Add shell env interpolation for ACCUMULO_CONF_DIR when extracting kerberos keytab value.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/559b18bc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/559b18bc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/559b18bc
Branch: refs/heads/master
Commit: 559b18bc73225ea2cc779ec727c8f49b29ab2924
Parents: adee0f1
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 18 16:30:31 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 18 16:30:31 2013 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/server/security/SecurityUtil.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/559b18bc/src/server/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java b/src/server/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java
index 94dcd1b..2d1ff53 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java
@@ -29,6 +29,7 @@ import org.apache.log4j.Logger;
*/
public class SecurityUtil {
private static final Logger log = Logger.getLogger(SecurityUtil.class);
+ private static final String ACCUMULO_HOME = "ACCUMULO_HOME", ACCUMULO_CONF_DIR = "ACCUMULO_CONF_DIR";
/**
* This method is for logging a server in kerberos. If this is used in client code, it will fail unless run as the accumulo keytab's owner. Instead, use
@@ -40,8 +41,11 @@ public class SecurityUtil {
String keyTab = acuConf.get(Property.GENERAL_KERBEROS_KEYTAB);
if (keyTab == null || keyTab.length() == 0)
return;
- if (keyTab.contains("$ACCUMULO_HOME") && System.getenv("ACCUMULO_HOME") != null)
- keyTab = keyTab.replace("$ACCUMULO_HOME", System.getenv("ACCUMULO_HOME"));
+ if (keyTab.contains("$" + ACCUMULO_HOME) && System.getenv(ACCUMULO_HOME) != null)
+ keyTab = keyTab.replace("$" + ACCUMULO_HOME, System.getenv(ACCUMULO_HOME));
+
+ if (keyTab.contains("$" + ACCUMULO_CONF_DIR) && System.getenv(ACCUMULO_CONF_DIR) != null)
+ keyTab = keyTab.replace("$" + ACCUMULO_CONF_DIR, System.getenv(ACCUMULO_CONF_DIR));
String principalConfig = acuConf.get(Property.GENERAL_KERBEROS_PRINCIPAL);
if (principalConfig == null || principalConfig.length() == 0)
[10/10] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3be435e9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3be435e9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3be435e9
Branch: refs/heads/master
Commit: 3be435e9fc7a20a65233f25cc1c52fdda586e8b4
Parents: ad676c1 152f194
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 18 21:54:34 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 18 21:54:34 2013 -0500
----------------------------------------------------------------------
bin/accumulo | 2 +-
.../1GB/native-standalone/accumulo-site.xml | 5 +
conf/examples/1GB/standalone/accumulo-site.xml | 5 +
.../2GB/native-standalone/accumulo-site.xml | 5 +
conf/examples/2GB/standalone/accumulo-site.xml | 123 ++++++++++---------
.../3GB/native-standalone/accumulo-site.xml | 5 +
conf/examples/3GB/standalone/accumulo-site.xml | 5 +
.../512MB/native-standalone/accumulo-site.xml | 5 +
.../examples/512MB/standalone/accumulo-site.xml | 5 +
conf/examples/crypto/accumulo-site.xml | 5 +
conf/examples/vfs-classloader/accumulo-site.xml | 5 +
.../accumulo/core/security/SecurityUtil.java | 1 +
12 files changed, 111 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
[09/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
bin/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/152f1942
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/152f1942
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/152f1942
Branch: refs/heads/master
Commit: 152f1942ee894d75836d6d9321585913bc176e79
Parents: 5d952c7 a55f5d3
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 18 21:53:25 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 18 21:53:25 2013 -0500
----------------------------------------------------------------------
bin/accumulo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/152f1942/bin/accumulo
----------------------------------------------------------------------
diff --cc bin/accumulo
index 14918c8,2ad8720..89f5624
--- a/bin/accumulo
+++ b/bin/accumulo
@@@ -125,29 -104,26 +125,29 @@@ if [ ! -d "${ACCUMULO_LOG_DIR}" ]; the
mkdir -p "$ACCUMULO_LOG_DIR"
fi
-# Export the variables just in case they are not exported
-# This makes them available to java
-export JAVA_HOME HADOOP_PREFIX ZOOKEEPER_HOME
-
-JAVA="${JAVA_HOME}/bin/java"
-PLATFORM=$( "${JAVA}" -cp "${CLASSPATH}" org.apache.accumulo.start.Platform )
-
-# Try to find the hadoop native library, defaulting to where it should
-# be for the default Hadoop version
-LIB_PATH="${HADOOP_PREFIX}/lib/native/${PLATFORM}"
+# This is default for hadoop 2.x;
+# for hadoop 1.0, 1.1, specify (DY)LD_LIBRARY_PATH
+# explicitly in ${ACCUMULO_HOME}/conf/accumulo-env.sh
+# usually something like:
+# ${HADOOP_PREFIX}/lib/native/${PLATFORM}
- if [ -d "${HADOOP_PREFIX}/lib/native" ]; then
+ if [ -e "${HADOOP_PREFIX}/lib/native/libhadoop.so" ]; then
- # hadoop-2.0
LIB_PATH="${HADOOP_PREFIX}/lib/native"
+ LD_LIBRARY_PATH="${LIB_PATH}:${LD_LIBRARY_PATH}" # For Linux
+ DYLD_LIBRARY_PATH="${LIB_PATH}:${DYLD_LIBRARY_PATH}" # For Mac
fi
+# Export the variables just in case they are not exported
+# This makes them available to java
+export JAVA_HOME HADOOP_PREFIX ZOOKEEPER_HOME LD_LIBRARY_PATH DYLD_LIBRARY_PATH
#
# app isn't used anywhere, but it makes the process easier to spot when ps/top/snmp truncate the command line
-exec $JAVA "-Dapp=$1" $ACCUMULO_OPTS -classpath "${CLASSPATH}" -XX:OnOutOfMemoryError="${ACCUMULO_KILL_CMD:-kill -9 %p}" \
+JAVA="${JAVA_HOME}/bin/java"
+exec $JAVA "-Dapp=$1" \
+ $ACCUMULO_OPTS \
+ -classpath "${CLASSPATH}" \
+ -XX:OnOutOfMemoryError="${ACCUMULO_KILL_CMD:-kill -9 %p}" \
+ -XX:-OmitStackTraceInFastThrow \
-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl \
- -Djava.library.path="${LIB_PATH}" \
-Dorg.apache.accumulo.core.home.dir="${ACCUMULO_HOME}" \
-Dhadoop.home.dir="${HADOOP_PREFIX}" \
-Dzookeeper.home.dir="${ZOOKEEPER_HOME}" \
[04/10] git commit: ACCUMULO-2060 Add additional classpath entries
that typically contain hadoop artifacts.
Posted by el...@apache.org.
ACCUMULO-2060 Add additional classpath entries that typically contain hadoop artifacts.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/40df8cdb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/40df8cdb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/40df8cdb
Branch: refs/heads/master
Commit: 40df8cdbdf2723ea5c0a74e04a4b2c73df068ba2
Parents: 559b18b
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 18 18:55:38 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 18 18:55:38 2013 -0500
----------------------------------------------------------------------
.../examples/1GB/native-standalone/accumulo-site.xml | 9 ++++++++-
conf/examples/1GB/standalone/accumulo-site.xml | 9 ++++++++-
.../examples/2GB/native-standalone/accumulo-site.xml | 10 +++++++++-
conf/examples/2GB/standalone/accumulo-site.xml | 15 +++++++++++++++
.../examples/3GB/native-standalone/accumulo-site.xml | 9 ++++++++-
conf/examples/3GB/standalone/accumulo-site.xml | 9 ++++++++-
.../512MB/native-standalone/accumulo-site.xml | 9 ++++++++-
conf/examples/512MB/standalone/accumulo-site.xml | 9 ++++++++-
8 files changed, 72 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40df8cdb/conf/examples/1GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/1GB/native-standalone/accumulo-site.xml b/conf/examples/1GB/native-standalone/accumulo-site.xml
index 3f21599..3ff1537 100644
--- a/conf/examples/1GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/1GB/native-standalone/accumulo-site.xml
@@ -95,12 +95,19 @@
<property>
<name>general.classpaths</name>
<!--
- Add the following for hadoop-2.0
+ Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+ This list may be excessive, but this should cause no issues.
+
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ /usr/lib/hadoop/.*.jar,
+ /usr/lib/hadoop/lib/.*.jar,
+ /usr/lib/hadoop-hdfs/.*.jar,
+ /usr/lib/hadoop-mapreduce/.*.jar,
+ /usr/lib/hadoop-yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40df8cdb/conf/examples/1GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/1GB/standalone/accumulo-site.xml b/conf/examples/1GB/standalone/accumulo-site.xml
index f477092..eddb25f 100644
--- a/conf/examples/1GB/standalone/accumulo-site.xml
+++ b/conf/examples/1GB/standalone/accumulo-site.xml
@@ -90,12 +90,19 @@
<property>
<name>general.classpaths</name>
<!--
- Add the following for hadoop-2.0
+ Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+ This list may be excessive, but this should cause no issues.
+
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ /usr/lib/hadoop/.*.jar,
+ /usr/lib/hadoop/lib/.*.jar,
+ /usr/lib/hadoop-hdfs/.*.jar,
+ /usr/lib/hadoop-mapreduce/.*.jar,
+ /usr/lib/hadoop-yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40df8cdb/conf/examples/2GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/2GB/native-standalone/accumulo-site.xml b/conf/examples/2GB/native-standalone/accumulo-site.xml
index 835e0fb..811f9f8 100644
--- a/conf/examples/2GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/2GB/native-standalone/accumulo-site.xml
@@ -85,11 +85,19 @@
<property>
<name>general.classpaths</name>
<!--
- Add the following for hadoop-2.0
+ Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+ This list may be excessive, but this should cause no issues.
+
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ /usr/lib/hadoop/.*.jar,
+ /usr/lib/hadoop/lib/.*.jar,
+ /usr/lib/hadoop-hdfs/.*.jar,
+ /usr/lib/hadoop-mapreduce/.*.jar,
+ /usr/lib/hadoop-yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40df8cdb/conf/examples/2GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/2GB/standalone/accumulo-site.xml b/conf/examples/2GB/standalone/accumulo-site.xml
index 9f5d7fd..690142e 100644
--- a/conf/examples/2GB/standalone/accumulo-site.xml
+++ b/conf/examples/2GB/standalone/accumulo-site.xml
@@ -84,6 +84,21 @@
<property>
<name>general.classpaths</name>
+ <!--
+ Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+ This list may be excessive, but this should cause no issues.
+
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ /usr/lib/hadoop/.*.jar,
+ /usr/lib/hadoop/lib/.*.jar,
+ /usr/lib/hadoop-hdfs/.*.jar,
+ /usr/lib/hadoop-mapreduce/.*.jar,
+ /usr/lib/hadoop-yarn/.*.jar,
+ -->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
$ACCUMULO_HOME/src/core/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40df8cdb/conf/examples/3GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/3GB/native-standalone/accumulo-site.xml b/conf/examples/3GB/native-standalone/accumulo-site.xml
index 6730955..1e99a93 100644
--- a/conf/examples/3GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/3GB/native-standalone/accumulo-site.xml
@@ -80,12 +80,19 @@
<property>
<name>general.classpaths</name>
<!--
- Add the following for hadoop-2.0
+ Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+ This list may be excessive, but this should cause no issues.
+
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ /usr/lib/hadoop/.*.jar,
+ /usr/lib/hadoop/lib/.*.jar,
+ /usr/lib/hadoop-hdfs/.*.jar,
+ /usr/lib/hadoop-mapreduce/.*.jar,
+ /usr/lib/hadoop-yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40df8cdb/conf/examples/3GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/3GB/standalone/accumulo-site.xml b/conf/examples/3GB/standalone/accumulo-site.xml
index 6730955..1e99a93 100644
--- a/conf/examples/3GB/standalone/accumulo-site.xml
+++ b/conf/examples/3GB/standalone/accumulo-site.xml
@@ -80,12 +80,19 @@
<property>
<name>general.classpaths</name>
<!--
- Add the following for hadoop-2.0
+ Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+ This list may be excessive, but this should cause no issues.
+
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ /usr/lib/hadoop/.*.jar,
+ /usr/lib/hadoop/lib/.*.jar,
+ /usr/lib/hadoop-hdfs/.*.jar,
+ /usr/lib/hadoop-mapreduce/.*.jar,
+ /usr/lib/hadoop-yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40df8cdb/conf/examples/512MB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/512MB/native-standalone/accumulo-site.xml b/conf/examples/512MB/native-standalone/accumulo-site.xml
index f241f4c..2b9584c 100644
--- a/conf/examples/512MB/native-standalone/accumulo-site.xml
+++ b/conf/examples/512MB/native-standalone/accumulo-site.xml
@@ -90,12 +90,19 @@
<property>
<name>general.classpaths</name>
<!--
- Add the following for hadoop-2.0
+ Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+ This list may be excessive, but this should cause no issues.
+
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ /usr/lib/hadoop/.*.jar,
+ /usr/lib/hadoop/lib/.*.jar,
+ /usr/lib/hadoop-hdfs/.*.jar,
+ /usr/lib/hadoop-mapreduce/.*.jar,
+ /usr/lib/hadoop-yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40df8cdb/conf/examples/512MB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/512MB/standalone/accumulo-site.xml b/conf/examples/512MB/standalone/accumulo-site.xml
index b51014e..a312a87 100644
--- a/conf/examples/512MB/standalone/accumulo-site.xml
+++ b/conf/examples/512MB/standalone/accumulo-site.xml
@@ -90,12 +90,19 @@
<property>
<name>general.classpaths</name>
<!--
- Add the following for hadoop-2.0
+ Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+ This list may be excessive, but this should cause no issues.
+
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ /usr/lib/hadoop/.*.jar,
+ /usr/lib/hadoop/lib/.*.jar,
+ /usr/lib/hadoop-hdfs/.*.jar,
+ /usr/lib/hadoop-mapreduce/.*.jar,
+ /usr/lib/hadoop-yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
[08/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
bin/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a55f5d3f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a55f5d3f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a55f5d3f
Branch: refs/heads/master
Commit: a55f5d3f02af0eed1337762925c8b88bc022239a
Parents: 4bed940 53a7d51
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 18 21:41:56 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 18 21:41:56 2013 -0500
----------------------------------------------------------------------
bin/accumulo | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a55f5d3f/bin/accumulo
----------------------------------------------------------------------
diff --cc bin/accumulo
index 1d1040e,172951e..2ad8720
--- a/bin/accumulo
+++ b/bin/accumulo
@@@ -15,114 -15,139 +15,117 @@@
# See the License for the specific language governing permissions and
# limitations under the License.
-# The main Accumulo command script.
-#
-# Environment variables parameters:
-#
-# JAVA_HOME The java implenetation to use.
-# ACCUMULO_CONF_DIR Location where accumulo-env.sh, accumulo-site.xml and friends will be read from
-# ACCUMULO_LOG_DIR Directory for accmulo daemon logs. defaults to $ACCUMULO_HOME/logs
-# ACCUMULO_VERSION This Accumulo's version number
-# HADOOP_HOME The home diretcory for HADOOP. Defaults to bin/hadoop's parent.
-#
-# Java jvm paramters: (-Xmx et al)
-#
-# ACCUMULO_TSERVER_OPTS
-# ACCUMULO_MASTER_OPTS
-# ACCUMULO_GC_OPTS
-# ACCUMULO_MONITOR_OPTS
-# ACCUMULO_LOGGER_OPTS
-# ACCUMULO_GENERAL_OPTS
-# ACCUMULO_OTHER_OPTS
-#
-# Environment variables overriden by config.sh
-#
-# ACCUMULO_HOME Always the parent dir of bin/accumulo
-
-bin=`dirname "$0"`
-bin=`cd "$bin"; pwd`
+# Start: Resolve Script Directory
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a symlink
+ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
+ SOURCE="$(readlink "${SOURCE}")"
+ [[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
+script=$( basename "${SOURCE}" )
+# Stop: Resolve Script Directory
-. "$bin"/config.sh
+. "${bin}"/config.sh
-if [ -z "$JAVA_HOME" -o ! -d "$JAVA_HOME" ]; then
- echo "JAVA_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh"
- exit 1
-fi
-if [ -z $HADOOP_PREFIX -o ! -d $HADOOP_PREFIX ]; then
- echo "HADOOP_PREFIX is not set. Please make sure it's set globally or in conf/accumulo-env.sh"
- exit 1
-fi
-if [ -z "$ZOOKEEPER_HOME" -o ! -d "$ZOOKEEPER_HOME" ]; then
- echo "ZOOKEEPER_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh"
- exit 1
-fi
-
-#Export the variables just in case they are not exported
-#This makes them available to java
-export JAVA_HOME=$JAVA_HOME
-export HADOOP_PREFIX=$HADOOP_PREFIX
-export ZOOKEEPER_HOME=$ZOOKEEPER_HOME
-# backwards compatible with old configurations
-export HADOOP_HOME=$HADOOP_PREFIX
-export HADOOP_HOME_WARN_SUPPRESS=1
-
-START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar
-COMMONS_JCI_JARS=$ACCUMULO_HOME/lib/commons-jci-core-1.0.jar:$ACCUMULO_HOME/lib/commons-jci-fam-1.0.jar:$ACCUMULO_HOME/lib/log4j-1.2.16.jar:$ACCUMULO_HOME/lib/commons-logging-1.0.4.jar:$ACCUMULO_HOME/lib/commons-logging-api-1.0.4.jar
-START_CLASSES_DIR=$ACCUMULO_HOME/src/start/target/classes
+START_JAR="${ACCUMULO_HOME}/lib/accumulo-start.jar"
+#
+# Resolve a program to its installation directory
+#
locationByProgram()
{
- # find the program
- RESULT=`which $1`
- # strip the program name from the path
- RESULT=`dirname ${RESULT}`
- # strip /bin from the path
- RESULT=`dirname ${RESULT}`
- echo ${RESULT}
+ RESULT=$( which "$1" )
+ if [[ "$?" != 0 && -z "${RESULT}" ]]; then
+ echo "Cannot find '$1' and '$2' is not set in $ACCUMULO_CONF_DIR/accumulo-env.sh"
+ exit 1
+ fi
+ while [ -h "${RESULT}" ]; do # resolve $RESULT until the file is no longer a symlink
+ DIR="$( cd -P "$( dirname "$RESULT" )" && pwd )"
+ RESULT="$(readlink "${RESULT}")"
+ [[ "${RESULT}" != /* ]] && RESULT="${DIR}/${RESULT}" # if $RESULT was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+ done
+ # find the relative home directory
+ RESULT=$(dirname "${RESULT}")
+ echo "Auto-set ${2} to '${RESULT}'. To suppress this message, set ${2} in conf/accumulo-env.sh"
+ eval "${2}=${RESULT}"
}
-test -n "$JAVA_HOME" || export JAVA_HOME=`locationByProgram java`
-test -n "$HADOOP_PREFIX" || export HADOOP_PREFIX=`locationByProgram hadoop`
-test -n "$ZOOKEEPER_HOME" || export ZOOKEEPER_HOME=`locationByProgram zkCli.sh`
-
+test -z "${JAVA_HOME}" && locationByProgram java JAVA_HOME
+test -z "${HADOOP_PREFIX}" && locationByProgram hadoop HADOOP_PREFIX
+test -z "${ZOOKEEPER_HOME}" && locationByProgram zkCli.sh ZOOKEEPER_HOME
DEFAULT_GENERAL_JAVA_OPTS=""
-BIG=6g
-MED=3g
-SMALL=512m
-if ! "$JAVA_HOME/bin/java" -Xms10g -Xmx10g >/dev/null 2>&1 ; then
- BIG=3g
- MED=1g
- SMALL=256m
-fi
-
-test -n "$ACCUMULO_TSERVER_OPTS" || export ACCUMULO_TSERVER_OPTS="-Xmx$BIG -Xms$BIG "
-test -n "$ACCUMULO_MASTER_OPTS" || export ACCUMULO_MASTER_OPTS="-Xmx$MED -Xms$MED "
-test -n "$ACCUMULO_GC_OPTS" || export ACCUMULO_GC_OPTS="-Xmx$SMALL -Xms$SMALL "
-test -n "$ACCUMULO_MONITOR_OPTS" || export ACCUMULO_MONITOR_OPTS="-Xmx$MED -Xms$SMALL "
-test -n "$ACCUMULO_LOGGER_OPTS" || export ACCUMULO_LOGGER_OPTS="-Xmx$MED -Xms$SMALL "
-test -n "$ACCUMULO_GENERAL_OPTS" || export ACCUMULO_GENERAL_OPTS="$DEFAULT_GENERAL_JAVA_OPTS"
-test -n "$ACCUMULO_OTHER_OPTS" || export ACCUMULO_OTHER_OPTS="-Xmx$MED -Xms$SMALL "
+#
# ACCUMULO_XTRAJARS is where all of the commandline -add items go into for reading by accumulo.
+#
if [ "$1" = "-add" ] ; then
- export ACCUMULO_XTRAJARS=$2
- shift 2
+ export ACCUMULO_XTRAJARS="$2"
+ shift 2
else
- export ACCUMULO_XTRAJARS=""
+ export ACCUMULO_XTRAJARS=""
fi
-if [ "$1" = "master" ] ; then
- export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_MASTER_OPTS}"
-elif [ "$1" = "gc" ] ; then
- export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_GC_OPTS}"
-elif [ "$1" = "tserver" ] ; then
- export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_TSERVER_OPTS}"
-elif [ "$1" = "monitor" ] ; then
- export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_MONITOR_OPTS}"
-elif [ "$1" = "logger" ] ; then
- export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_LOGGER_OPTS}"
-else
- export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_OTHER_OPTS}"
+#
+# Add appropriate options for process type
+#
+case "$1" in
+master) export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_MASTER_OPTS}" ;;
+gc) export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_GC_OPTS}" ;;
+tserver) export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_TSERVER_OPTS}" ;;
+monitor) export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_MONITOR_OPTS}" ;;
+logger) export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_LOGGER_OPTS}" ;;
+*) export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_OTHER_OPTS}" ;;
+esac
+
+XML_FILES="${ACCUMULO_CONF_DIR}"
+LOG4J_JAR=$(find -H "${HADOOP_PREFIX}/lib" "${HADOOP_PREFIX}"/share/hadoop/common/lib -name 'log4j*.jar' -print 2>/dev/null | head -1)
+CLASSPATH="${XML_FILES}:${START_JAR}:${LOG4J_JAR}"
+
+if [ -z "${JAVA_HOME}" -o ! -d "${JAVA_HOME}" ]; then
+ echo "JAVA_HOME is not set or is not a directory. Please make sure it's set globally or in conf/accumulo-env.sh"
+ exit 1
+fi
+if [ -z "${HADOOP_PREFIX}" -o ! -d "${HADOOP_PREFIX}" ]; then
+ echo "HADOOP_PREFIX is not set or is not a directory. Please make sure it's set globally or in conf/accumulo-env.sh"
+ exit 1
+fi
+if [ -z "${ZOOKEEPER_HOME}" -o ! -d "${ZOOKEEPER_HOME}" ]; then
+ echo "ZOOKEEPER_HOME is not set or is not a directory. Please make sure it's set globally or in conf/accumulo-env.sh"
+ exit 1
+fi
+if [ -z "${ACCUMULO_LOG_DIR}" ]; then
+ echo "ACCUMULO_LOG_DIR is not set. Please make sure it's set globally or in conf/accumulo-env.sh"
+ exit 1
fi
-XML_FILES=${ACCUMULO_CONF_DIR}
-CLASSPATH=${XML_FILES}:${START_JAR}:${COMMONS_JCI_JARS}
+if [ ! -d "${ACCUMULO_LOG_DIR}" ]; then
+ mkdir -p "$ACCUMULO_LOG_DIR"
+fi
+
+# Export the variables just in case they are not exported
+# This makes them available to java
+export JAVA_HOME HADOOP_PREFIX ZOOKEEPER_HOME
-JAVA=$JAVA_HOME/bin/java
-PLATFORM="`$JAVA -cp $CLASSPATH org.apache.accumulo.start.Platform`"
+JAVA="${JAVA_HOME}/bin/java"
+PLATFORM=$( "${JAVA}" -cp "${CLASSPATH}" org.apache.accumulo.start.Platform )
- # hadoop 1.0, 1.1
+
+ # Try to find the hadoop native library, defaulting to where it should
+ # be for the default Hadoop version
-LIB_PATH="$HADOOP_PREFIX/lib/native/$PLATFORM"
-
-if [ -e "$HADOOP_PREFIX/lib/native/libhadoop.so" ]; then
- # hadoop-2.0
- LIB_PATH=$HADOOP_PREFIX/lib/native
+LIB_PATH="${HADOOP_PREFIX}/lib/native/${PLATFORM}"
- if [ ! -d "${LIB_PATH}" ]; then
++if [ -e "${HADOOP_PREFIX}/lib/native/libhadoop.so" ]; then
+ # hadoop-2.0
+ LIB_PATH="${HADOOP_PREFIX}/lib/native"
fi
+
#
# app isn't used anywhere, but it makes the process easier to spot when ps/top/snmp truncate the command line
-exec $JAVA "-Dapp=$1" $ACCUMULO_OPTS -classpath $CLASSPATH -XX:OnOutOfMemoryError="${ACCUMULO_KILL_CMD:-kill -9 %p}" \
+exec $JAVA "-Dapp=$1" $ACCUMULO_OPTS -classpath "${CLASSPATH}" -XX:OnOutOfMemoryError="${ACCUMULO_KILL_CMD:-kill -9 %p}" \
-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl \
- -Djava.library.path="$LIB_PATH" \
- -Dorg.apache.accumulo.core.home.dir="$ACCUMULO_HOME" \
- -Dhadoop.home.dir="$HADOOP_PREFIX" \
- -Dzookeeper.home.dir="$ZOOKEEPER_HOME" \
+ -Djava.library.path="${LIB_PATH}" \
+ -Dorg.apache.accumulo.core.home.dir="${ACCUMULO_HOME}" \
+ -Dhadoop.home.dir="${HADOOP_PREFIX}" \
+ -Dzookeeper.home.dir="${ZOOKEEPER_HOME}" \
org.apache.accumulo.start.Main \
"$@"
[02/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/001fdd69
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/001fdd69
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/001fdd69
Branch: refs/heads/master
Commit: 001fdd69b694236335f98127f7b07636a12a6329
Parents: 2d97b87 559b18b
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 18 16:33:25 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 18 16:33:25 2013 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/core/security/SecurityUtil.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/001fdd69/core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java
index 8add1a7,0000000..672e784
mode 100644,000000..100644
--- a/core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java
@@@ -1,84 -1,0 +1,89 @@@
+/*
+ * 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.
+ */
+package org.apache.accumulo.core.security;
+
+import java.io.IOException;
+import java.net.InetAddress;
+
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.log4j.Logger;
+
+/**
+ *
+ */
+public class SecurityUtil {
+ private static final Logger log = Logger.getLogger(SecurityUtil.class);
++ private static final String ACCUMULO_HOME = "ACCUMULO_HOME", ACCUMULO_CONF_DIR = "ACCUMULO_CONF_DIR";
+ public static boolean usingKerberos = false;
++
+ /**
+ * This method is for logging a server in kerberos. If this is used in client code, it will fail unless run as the accumulo keytab's owner. Instead, use
+ * {@link #login(String, String)}
+ */
+ public static void serverLogin() {
+ @SuppressWarnings("deprecation")
+ AccumuloConfiguration acuConf = AccumuloConfiguration.getSiteConfiguration();
+ String keyTab = acuConf.get(Property.GENERAL_KERBEROS_KEYTAB);
+ if (keyTab == null || keyTab.length() == 0)
+ return;
+
+ usingKerberos = true;
- if (keyTab.contains("$ACCUMULO_HOME") && System.getenv("ACCUMULO_HOME") != null)
- keyTab = keyTab.replace("$ACCUMULO_HOME", System.getenv("ACCUMULO_HOME"));
++ if (keyTab.contains("$" + ACCUMULO_HOME) && System.getenv(ACCUMULO_HOME) != null)
++ keyTab = keyTab.replace("$" + ACCUMULO_HOME, System.getenv(ACCUMULO_HOME));
++
++ if (keyTab.contains("$" + ACCUMULO_CONF_DIR) && System.getenv(ACCUMULO_CONF_DIR) != null)
++ keyTab = keyTab.replace("$" + ACCUMULO_CONF_DIR, System.getenv(ACCUMULO_CONF_DIR));
+
+ String principalConfig = acuConf.get(Property.GENERAL_KERBEROS_PRINCIPAL);
+ if (principalConfig == null || principalConfig.length() == 0)
+ return;
+
+ if (login(principalConfig, keyTab)) {
+ try {
+ // This spawns a thread to periodically renew the logged in (accumulo) user
+ UserGroupInformation.getLoginUser();
+ } catch (IOException io) {
+ log.error("Error starting up renewal thread. This shouldn't be happenining.", io);
+ }
+ }
+ }
+
+ /**
+ * This will log in the given user in kerberos.
+ *
+ * @param principalConfig
+ * This is the principals name in the format NAME/HOST@REALM. {@link org.apache.hadoop.security.SecurityUtil#HOSTNAME_PATTERN} will automatically be
+ * replaced by the systems host name.
+ * @param keyTabPath
+ * @return true if login succeeded, otherwise false
+ */
+ public static boolean login(String principalConfig, String keyTabPath) {
+ try {
+ String principalName = org.apache.hadoop.security.SecurityUtil.getServerPrincipal(principalConfig, InetAddress.getLocalHost().getCanonicalHostName());
+ if (keyTabPath != null && principalName != null && keyTabPath.length() != 0 && principalName.length() != 0) {
+ UserGroupInformation.loginUserFromKeytab(principalName, keyTabPath);
+ log.info("Succesfully logged in as user " + principalConfig);
+ return true;
+ }
+ } catch (IOException io) {
+ log.error("Error logging in user " + principalConfig + " using keytab at " + keyTabPath, io);
+ }
+ return false;
+ }
+}
[07/10] git commit: ACCUMULO-2004 Check for libhadoop.so,
not the a directory we think it might be in.
Posted by el...@apache.org.
ACCUMULO-2004 Check for libhadoop.so, not the a directory we think it might be in.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/53a7d518
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/53a7d518
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/53a7d518
Branch: refs/heads/master
Commit: 53a7d518cacf2d64ccd2ab04fa84242adf8084b1
Parents: 40df8cd
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 18 21:30:27 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 18 21:30:27 2013 -0500
----------------------------------------------------------------------
bin/accumulo | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/53a7d518/bin/accumulo
----------------------------------------------------------------------
diff --git a/bin/accumulo b/bin/accumulo
index e2a89e9..172951e 100755
--- a/bin/accumulo
+++ b/bin/accumulo
@@ -131,12 +131,16 @@ CLASSPATH=${XML_FILES}:${START_JAR}:${COMMONS_JCI_JARS}
JAVA=$JAVA_HOME/bin/java
PLATFORM="`$JAVA -cp $CLASSPATH org.apache.accumulo.start.Platform`"
-# hadoop 1.0, 1.1
+
+# Try to find the hadoop native library, defaulting to where it should
+# be for the default Hadoop version
LIB_PATH="$HADOOP_PREFIX/lib/native/$PLATFORM"
-if [ ! -d "$LIB_PATH" ]; then
- # hadoop-2.0
- LIB_PATH=$HADOOP_PREFIX/lib/native
+
+if [ -e "$HADOOP_PREFIX/lib/native/libhadoop.so" ]; then
+ # hadoop-2.0
+ LIB_PATH=$HADOOP_PREFIX/lib/native
fi
+
#
# app isn't used anywhere, but it makes the process easier to spot when ps/top/snmp truncate the command line
exec $JAVA "-Dapp=$1" $ACCUMULO_OPTS -classpath $CLASSPATH -XX:OnOutOfMemoryError="${ACCUMULO_KILL_CMD:-kill -9 %p}" \
[05/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
conf/examples/2GB/native-standalone/accumulo-site.xml
conf/examples/2GB/standalone/accumulo-site.xml
Also fixed the formatting in 2GB-standalone as it didn't match everything else.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4bed9404
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4bed9404
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4bed9404
Branch: refs/heads/master
Commit: 4bed94046b77000361125c8967b93804b95a1014
Parents: 001fdd6 40df8cd
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 18 19:03:12 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 18 19:03:12 2013 -0500
----------------------------------------------------------------------
.../1GB/native-standalone/accumulo-site.xml | 9 +-
conf/examples/1GB/standalone/accumulo-site.xml | 9 +-
.../2GB/native-standalone/accumulo-site.xml | 9 +-
conf/examples/2GB/standalone/accumulo-site.xml | 137 ++++++++++---------
.../3GB/native-standalone/accumulo-site.xml | 9 +-
conf/examples/3GB/standalone/accumulo-site.xml | 9 +-
.../512MB/native-standalone/accumulo-site.xml | 9 +-
.../examples/512MB/standalone/accumulo-site.xml | 9 +-
8 files changed, 128 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bed9404/conf/examples/1GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/1GB/native-standalone/accumulo-site.xml
index 7e54b23,3ff1537..9cb169f
--- a/conf/examples/1GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/1GB/native-standalone/accumulo-site.xml
@@@ -18,104 -18,112 +18,111 @@@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<configuration>
- <!--
- Put your site-specific accumulo configurations here.
-
- The available configuration values along with their defaults
- are documented in docs/config.html
-
- Unless you are simply testing at your workstation, you will most
- definitely need to change the three entries below.
- -->
-
- <property>
- <name>instance.zookeeper.host</name>
- <value>localhost:2181</value>
- <description>comma separated list of zookeeper servers</description>
- </property>
-
- <property>
- <name>logger.dir.walog</name>
- <value>walogs</value>
- <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
- </property>
-
- <property>
- <name>instance.secret</name>
- <value>DEFAULT</value>
- <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
- Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd],
- and then update this file.
- </description>
- </property>
-
- <property>
- <name>tserver.memory.maps.max</name>
- <value>256M</value>
- </property>
-
- <property>
- <name>tserver.cache.data.size</name>
- <value>15M</value>
- </property>
-
- <property>
- <name>tserver.cache.index.size</name>
- <value>40M</value>
- </property>
-
- <property>
- <name>trace.password</name>
- <!--
- change this to the root user's password, and/or change the user below
- -->
- <value>secret</value>
- </property>
-
- <property>
- <name>trace.user</name>
- <value>root</value>
- </property>
-
- <property>
- <name>logger.sort.buffer.size</name>
- <value>50M</value>
- </property>
-
- <property>
- <name>tserver.walog.max.size</name>
- <value>256M</value>
- </property>
-
- <property>
- <name>tserver.walog.max.size</name>
- <value>100M</value>
- </property>
-
- <property>
- <name>general.classpaths</name>
+ <!-- Put your site-specific accumulo configurations here. The available configuration values along with their defaults are documented in docs/config.html Unless
+ you are simply testing at your workstation, you will most definitely need to change the three entries below. -->
+
+ <property>
+ <name>instance.zookeeper.host</name>
+ <value>localhost:2181</value>
+ <description>comma separated list of zookeeper servers</description>
+ </property>
+
+ <property>
+ <name>logger.dir.walog</name>
+ <value>walogs</value>
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
+ </description>
+ </property>
+
+ <property>
+ <name>instance.secret</name>
+ <value>DEFAULT</value>
+ <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
+ Change it before initialization. To
+ change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
+ and then update this file.
+ </description>
+ </property>
+
+ <property>
+ <name>tserver.memory.maps.max</name>
+ <value>256M</value>
+ </property>
+
+ <property>
+ <name>tserver.cache.data.size</name>
+ <value>15M</value>
+ </property>
+
+ <property>
+ <name>tserver.cache.index.size</name>
+ <value>40M</value>
+ </property>
+
+ <property>
+ <name>trace.token.property.password</name>
+ <!-- change this to the root user's password, and/or change the user below -->
+ <value>secret</value>
+ </property>
+
+ <property>
+ <name>trace.user</name>
+ <value>root</value>
+ </property>
+
+ <property>
+ <name>tserver.sort.buffer.size</name>
+ <value>50M</value>
+ </property>
+
+ <property>
+ <name>tserver.walog.max.size</name>
+ <value>256M</value>
+ </property>
+
+ <property>
+ <name>tserver.walog.max.size</name>
+ <value>100M</value>
+ </property>
+
+ <property>
+ <name>general.classpaths</name>
<!--
- Add the following for hadoop-2.0
+ Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+ This list may be excessive, but this should cause no issues.
+
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ /usr/lib/hadoop/.*.jar,
+ /usr/lib/hadoop/lib/.*.jar,
+ /usr/lib/hadoop-hdfs/.*.jar,
+ /usr/lib/hadoop-mapreduce/.*.jar,
+ /usr/lib/hadoop-yarn/.*.jar,
-->
- <value>
- $ACCUMULO_HOME/src/server/target/classes/,
- $ACCUMULO_HOME/src/core/target/classes/,
- $ACCUMULO_HOME/src/start/target/classes/,
- $ACCUMULO_HOME/src/examples/target/classes/,
- $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
- $ACCUMULO_HOME/lib/[^.].*.jar,
- $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
- $HADOOP_CONF_DIR,
- $HADOOP_PREFIX/[^.].*.jar,
- $HADOOP_PREFIX/lib/[^.].*.jar,
- </value>
- <description>Classpaths that accumulo checks for updates and class files.
+ <value>
+ $ACCUMULO_HOME/server/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-server.jar,
+ $ACCUMULO_HOME/core/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-core.jar,
+ $ACCUMULO_HOME/start/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-start.jar,
+ $ACCUMULO_HOME/fate/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-fate.jar,
+ $ACCUMULO_HOME/proxy/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-proxy.jar,
+ $ACCUMULO_HOME/lib/[^.].*.jar,
+ $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+ $HADOOP_CONF_DIR,
+ $HADOOP_PREFIX/[^.].*.jar,
+ $HADOOP_PREFIX/lib/[^.].*.jar,
+ </value>
+ <description>Classpaths that accumulo checks for updates and class files.
When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
- </property>
-
+ </description>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bed9404/conf/examples/1GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/1GB/standalone/accumulo-site.xml
index ec95e02,eddb25f..399a497
--- a/conf/examples/1GB/standalone/accumulo-site.xml
+++ b/conf/examples/1GB/standalone/accumulo-site.xml
@@@ -18,104 -18,107 +18,111 @@@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<configuration>
- <!--
- Put your site-specific accumulo configurations here.
-
- The available configuration values along with their defaults
- are documented in docs/config.html
-
- Unless you are simply testing at your workstation, you will most
- definitely need to change the three entries below.
- -->
-
- <property>
- <name>instance.zookeeper.host</name>
- <value>localhost:2181</value>
- <description>comma separated list of zookeeper servers</description>
- </property>
-
- <property>
- <name>logger.dir.walog</name>
- <value>walogs</value>
- <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
- </property>
-
- <property>
- <name>instance.secret</name>
- <value>DEFAULT</value>
- <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
- Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd],
- and then update this file.
- </description>
- </property>
-
- <property>
- <name>tserver.memory.maps.max</name>
- <value>256M</value>
- </property>
-
- <property>
- <name>tserver.cache.data.size</name>
- <value>15M</value>
- </property>
-
- <property>
- <name>tserver.cache.index.size</name>
- <value>40M</value>
- </property>
-
- <property>
- <name>trace.password</name>
- <!--
- change this to the root user's password, and/or change the user below
- -->
- <value>secret</value>
- </property>
-
- <property>
- <name>logger.sort.buffer.size</name>
- <value>50M</value>
- </property>
-
- <property>
- <name>trace.user</name>
- <value>root</value>
- </property>
-
- <property>
- <name>tserver.walog.max.size</name>
- <value>256M</value>
- </property>
-
- <property>
- <name>general.classpaths</name>
+ <!-- Put your site-specific accumulo configurations here. The available configuration values along with their defaults are documented in docs/config.html Unless
+ you are simply testing at your workstation, you will most definitely need to change the three entries below. -->
+
+ <property>
+ <name>instance.zookeeper.host</name>
+ <value>localhost:2181</value>
+ <description>comma separated list of zookeeper servers</description>
+ </property>
+
+ <property>
+ <name>logger.dir.walog</name>
+ <value>walogs</value>
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
+ </description>
+ </property>
+
+ <property>
+ <name>instance.secret</name>
+ <value>DEFAULT</value>
+ <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
+ Change it before initialization. To
+ change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
+ and then update this file.
+ </description>
+ </property>
+
+ <property>
+ <name>tserver.memory.maps.max</name>
+ <value>256M</value>
+ </property>
+
+ <property>
+ <name>tserver.memory.maps.native.enabled</name>
+ <value>false</value>
+ </property>
+
+ <property>
+ <name>tserver.cache.data.size</name>
+ <value>15M</value>
+ </property>
+
+ <property>
+ <name>tserver.cache.index.size</name>
+ <value>40M</value>
+ </property>
+
+ <property>
+ <name>trace.token.property.password</name>
+ <!-- change this to the root user's password, and/or change the user below -->
+ <value>secret</value>
+ </property>
+
+ <property>
+ <name>trace.user</name>
+ <value>root</value>
+ </property>
+
+ <property>
+ <name>tserver.sort.buffer.size</name>
+ <value>50M</value>
+ </property>
+
+ <property>
+ <name>tserver.walog.max.size</name>
+ <value>256M</value>
+ </property>
+
+ <property>
+ <name>general.classpaths</name>
<!--
- Add the following for hadoop-2.0
+ Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+ This list may be excessive, but this should cause no issues.
+
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ /usr/lib/hadoop/.*.jar,
+ /usr/lib/hadoop/lib/.*.jar,
+ /usr/lib/hadoop-hdfs/.*.jar,
+ /usr/lib/hadoop-mapreduce/.*.jar,
+ /usr/lib/hadoop-yarn/.*.jar,
-->
- <value>
- $ACCUMULO_HOME/src/server/target/classes/,
- $ACCUMULO_HOME/src/core/target/classes/,
- $ACCUMULO_HOME/src/start/target/classes/,
- $ACCUMULO_HOME/src/examples/target/classes/,
- $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
- $ACCUMULO_HOME/lib/[^.].*.jar,
- $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
- $HADOOP_CONF_DIR,
- $HADOOP_PREFIX/[^.].*.jar,
- $HADOOP_PREFIX/lib/[^.].*.jar,
- </value>
- <description>Classpaths that accumulo checks for updates and class files.
+ <value>
+ $ACCUMULO_HOME/server/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-server.jar,
+ $ACCUMULO_HOME/core/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-core.jar,
+ $ACCUMULO_HOME/start/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-start.jar,
+ $ACCUMULO_HOME/fate/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-fate.jar,
+ $ACCUMULO_HOME/proxy/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-proxy.jar,
+ $ACCUMULO_HOME/lib/[^.].*.jar,
+ $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+ $HADOOP_CONF_DIR,
+ $HADOOP_PREFIX/[^.].*.jar,
+ $HADOOP_PREFIX/lib/[^.].*.jar,
+ </value>
+ <description>Classpaths that accumulo checks for updates and class files.
When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
- </property>
-
+ </description>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bed9404/conf/examples/2GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/2GB/native-standalone/accumulo-site.xml
index f0f6f7f,811f9f8..d754ea9
--- a/conf/examples/2GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/2GB/native-standalone/accumulo-site.xml
@@@ -18,94 -18,102 +18,101 @@@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<configuration>
- <!--
- Put your site-specific accumulo configurations here.
+ <!-- Put your site-specific accumulo configurations here. The available configuration values along with their defaults are documented in docs/config.html Unless
+ you are simply testing at your workstation, you will most definitely need to change the three entries below. -->
- The available configuration values along with their defaults
- are documented in docs/config.html
+ <property>
+ <name>instance.zookeeper.host</name>
+ <value>localhost:2181</value>
+ <description>comma separated list of zookeeper servers</description>
+ </property>
- Unless you are simply testing at your workstation, you will most
- definitely need to change the three entries below.
- -->
+ <property>
+ <name>logger.dir.walog</name>
+ <value>walogs</value>
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
+ </description>
+ </property>
- <property>
- <name>instance.zookeeper.host</name>
- <value>localhost:2181</value>
- <description>comma separated list of zookeeper servers</description>
- </property>
+ <property>
+ <name>instance.secret</name>
+ <value>DEFAULT</value>
+ <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
+ Change it before initialization. To
+ change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
+ and then update this file.
+ </description>
+ </property>
- <property>
- <name>logger.dir.walog</name>
- <value>walogs</value>
- <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
- </property>
-
- <property>
- <name>instance.secret</name>
- <value>DEFAULT</value>
- <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
- Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd],
- and then update this file.
- </description>
- </property>
+ <property>
+ <name>tserver.memory.maps.max</name>
+ <value>512M</value>
+ </property>
- <property>
- <name>tserver.memory.maps.max</name>
- <value>512M</value>
- </property>
-
- <property>
- <name>tserver.cache.data.size</name>
- <value>30M</value>
- </property>
-
- <property>
- <name>tserver.cache.index.size</name>
- <value>80M</value>
- </property>
-
- <property>
- <name>trace.password</name>
- <!--
- change this to the root user's password, and/or change the user below
- -->
- <value>secret</value>
- </property>
-
- <property>
- <name>trace.user</name>
- <value>root</value>
- </property>
+ <property>
+ <name>tserver.cache.data.size</name>
+ <value>30M</value>
+ </property>
- <property>
- <name>tserver.walog.max.size</name>
- <value>512M</value>
- </property>
+ <property>
+ <name>tserver.cache.index.size</name>
+ <value>80M</value>
+ </property>
- <property>
- <name>general.classpaths</name>
+ <property>
+ <name>trace.token.property.password</name>
+ <!-- change this to the root user's password, and/or change the user below -->
+ <value>secret</value>
+ </property>
+
+ <property>
+ <name>trace.user</name>
+ <value>root</value>
+ </property>
+
+ <property>
+ <name>tserver.walog.max.size</name>
+ <value>512M</value>
+ </property>
+
+ <property>
+ <name>general.classpaths</name>
<!--
- Add the following for hadoop-2.0
+ Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+ This list may be excessive, but this should cause no issues.
+
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ /usr/lib/hadoop/.*.jar,
+ /usr/lib/hadoop/lib/.*.jar,
+ /usr/lib/hadoop-hdfs/.*.jar,
+ /usr/lib/hadoop-mapreduce/.*.jar,
+ /usr/lib/hadoop-yarn/.*.jar,
-->
- <value>
- $ACCUMULO_HOME/src/server/target/classes/,
- $ACCUMULO_HOME/src/core/target/classes/,
- $ACCUMULO_HOME/src/start/target/classes/,
- $ACCUMULO_HOME/src/examples/target/classes/,
- $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
- $ACCUMULO_HOME/lib/[^.].*.jar,
- $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
- $HADOOP_CONF_DIR,
- $HADOOP_PREFIX/[^.].*.jar,
- $HADOOP_PREFIX/lib/[^.].*.jar,
- </value>
- <description>Classpaths that accumulo checks for updates and class files.
+ <value>
+ $ACCUMULO_HOME/server/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-server.jar,
+ $ACCUMULO_HOME/core/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-core.jar,
+ $ACCUMULO_HOME/start/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-start.jar,
+ $ACCUMULO_HOME/fate/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-fate.jar,
+ $ACCUMULO_HOME/proxy/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-proxy.jar,
+ $ACCUMULO_HOME/lib/[^.].*.jar,
+ $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+ $HADOOP_CONF_DIR,
+ $HADOOP_PREFIX/[^.].*.jar,
+ $HADOOP_PREFIX/lib/[^.].*.jar,
+ </value>
+ <description>Classpaths that accumulo checks for updates and class files.
When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
- </property>
-
+ </description>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bed9404/conf/examples/2GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/2GB/standalone/accumulo-site.xml
index e6e7b13,690142e..795592d
--- a/conf/examples/2GB/standalone/accumulo-site.xml
+++ b/conf/examples/2GB/standalone/accumulo-site.xml
@@@ -18,7 -18,7 +18,7 @@@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<configuration>
-- <!--
++ <!--
Put your site-specific accumulo configurations here.
The available configuration values along with their defaults
@@@ -26,99 -26,94 +26,106 @@@
Unless you are simply testing at your workstation, you will most
definitely need to change the three entries below.
-- -->
++ -->
-- <property>
-- <name>instance.zookeeper.host</name>
-- <value>localhost:2181</value>
-- <description>comma separated list of zookeeper servers</description>
-- </property>
++ <property>
++ <name>instance.zookeeper.host</name>
++ <value>localhost:2181</value>
++ <description>comma separated list of zookeeper servers</description>
++ </property>
-- <property>
-- <name>logger.dir.walog</name>
-- <value>walogs</value>
- <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
- filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
- write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
- <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
- </property>
-
- <property>
- <name>instance.secret</name>
- <value>DEFAULT</value>
- <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
- Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd],
- and then update this file.
- </description>
- </property>
++ <property>
++ <name>logger.dir.walog</name>
++ <value>walogs</value>
++ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
++ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
++ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
++ </description>
++ </property>
++
++ <property>
++ <name>instance.secret</name>
++ <value>DEFAULT</value>
++ <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
++ Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
++ and then update this file.
+ </description>
- </property>
-
- <property>
- <name>instance.secret</name>
- <value>DEFAULT</value>
- <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
- Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
- and then update this file.
- </description>
- </property>
++ </property>
-- <property>
-- <name>tserver.memory.maps.max</name>
-- <value>512M</value>
-- </property>
--
-- <property>
- <name>tserver.memory.maps.native.enabled</name>
- <value>false</value>
- </property>
- <name>tserver.cache.data.size</name>
- <value>30M</value>
- </property>
-
- <property>
- <name>tserver.cache.index.size</name>
- <value>80M</value>
- </property>
-
- <property>
- <name>trace.password</name>
- <!--
- change this to the root user's password, and/or change the user below
- -->
- <value>secret</value>
- </property>
-
- <property>
- <name>trace.user</name>
- <value>root</value>
- </property>
-
- <property>
- <name>tserver.walog.max.size</name>
- <value>512M</value>
- </property>
++ <property>
++ <name>tserver.memory.maps.max</name>
++ <value>512M</value>
++ </property>
++
++ <property>
++ <name>tserver.memory.maps.native.enabled</name>
++ <value>false</value>
++ </property>
-- <property>
- <name>tserver.cache.data.size</name>
- <value>30M</value>
- </property>
-
- <property>
- <name>tserver.cache.index.size</name>
- <value>80M</value>
- </property>
-
- <property>
- <name>trace.token.property.password</name>
- <!--
- change this to the root user's password, and/or change the user below
- -->
- <value>secret</value>
- </property>
-
- <property>
- <name>trace.user</name>
- <value>root</value>
- </property>
-
- <property>
- <name>tserver.walog.max.size</name>
- <value>512M</value>
- </property>
- <name>general.classpaths</name>
++ <property>
++ <name>tserver.cache.data.size</name>
++ <value>30M</value>
++ </property>
++
++ <property>
++ <name>tserver.cache.index.size</name>
++ <value>80M</value>
++ </property>
++
++ <property>
++ <name>trace.token.property.password</name>
++ <!--
++ change this to the root user's password, and/or change the user below
++ -->
++ <value>secret</value>
++ </property>
++
++ <property>
++ <name>trace.user</name>
++ <value>root</value>
++ </property>
++
++ <property>
++ <name>tserver.walog.max.size</name>
++ <value>512M</value>
++ </property>
+
+ <property>
+ <name>general.classpaths</name>
<!--
- Add the following for hadoop-2.0
- $HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
- $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
- $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
- $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
- Add the following for Hadoop2, actual needs depend on Hadoop installation details.
- This list may be excessive, but this should cause no issues.
++ Add the following for Hadoop2, actual needs depend on Hadoop installation details.
++ This list may be excessive, but this should cause no issues.
+
- $HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
- $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
- $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
- $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
- /usr/lib/hadoop/.*.jar,
- /usr/lib/hadoop/lib/.*.jar,
- /usr/lib/hadoop-hdfs/.*.jar,
- /usr/lib/hadoop-mapreduce/.*.jar,
- /usr/lib/hadoop-yarn/.*.jar,
++ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
++ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
++ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
++ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
++ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
++ /usr/lib/hadoop/.*.jar,
++ /usr/lib/hadoop/lib/.*.jar,
++ /usr/lib/hadoop-hdfs/.*.jar,
++ /usr/lib/hadoop-mapreduce/.*.jar,
++ /usr/lib/hadoop-yarn/.*.jar,
-->
- <value>
- $ACCUMULO_HOME/src/server/target/classes/,
- $ACCUMULO_HOME/src/core/target/classes/,
- $ACCUMULO_HOME/src/start/target/classes/,
- $ACCUMULO_HOME/src/examples/target/classes/,
- $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
- $ACCUMULO_HOME/lib/[^.].*.jar,
- $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
- $HADOOP_CONF_DIR,
- $HADOOP_PREFIX/[^.].*.jar,
- $HADOOP_PREFIX/lib/[^.].*.jar,
- </value>
- <description>Classpaths that accumulo checks for updates and class files.
+ <value>
+ $ACCUMULO_HOME/server/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-server.jar,
+ $ACCUMULO_HOME/core/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-core.jar,
+ $ACCUMULO_HOME/start/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-start.jar,
+ $ACCUMULO_HOME/fate/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-fate.jar,
+ $ACCUMULO_HOME/proxy/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-proxy.jar,
+ $ACCUMULO_HOME/lib/[^.].*.jar,
+ $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+ $HADOOP_CONF_DIR,
+ $HADOOP_PREFIX/[^.].*.jar,
+ $HADOOP_PREFIX/lib/[^.].*.jar,
+ </value>
+ <description>Classpaths that accumulo checks for updates and class files.
When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
- </property>
-
+ </description>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bed9404/conf/examples/3GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/3GB/native-standalone/accumulo-site.xml
index 417a1bc,1e99a93..d603095
--- a/conf/examples/3GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/3GB/native-standalone/accumulo-site.xml
@@@ -18,89 -18,97 +18,96 @@@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<configuration>
- <!--
- Put your site-specific accumulo configurations here.
+ <!-- Put your site-specific accumulo configurations here. The available configuration values along with their defaults are documented in docs/config.html Unless
+ you are simply testing at your workstation, you will most definitely need to change the three entries below. -->
- The available configuration values along with their defaults
- are documented in docs/config.html
+ <property>
+ <name>instance.zookeeper.host</name>
+ <value>localhost:2181</value>
+ <description>comma separated list of zookeeper servers</description>
+ </property>
- Unless you are simply testing at your workstation, you will most
- definitely need to change the three entries below.
- -->
+ <property>
+ <name>logger.dir.walog</name>
+ <value>walogs</value>
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
+ </description>
+ </property>
- <property>
- <name>instance.zookeeper.host</name>
- <value>localhost:2181</value>
- <description>comma separated list of zookeeper servers</description>
- </property>
+ <property>
+ <name>instance.secret</name>
+ <value>DEFAULT</value>
+ <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
+ Change it before initialization. To
+ change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
+ and then update this file.
+ </description>
+ </property>
- <property>
- <name>logger.dir.walog</name>
- <value>walogs</value>
- <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
- </property>
-
- <property>
- <name>instance.secret</name>
- <value>DEFAULT</value>
- <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
- Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd],
- and then update this file.
- </description>
- </property>
+ <property>
+ <name>tserver.memory.maps.max</name>
+ <value>1G</value>
+ </property>
- <property>
- <name>tserver.memory.maps.max</name>
- <value>1G</value>
- </property>
-
- <property>
- <name>tserver.cache.data.size</name>
- <value>50M</value>
- </property>
-
- <property>
- <name>tserver.cache.index.size</name>
- <value>512M</value>
- </property>
-
- <property>
- <name>trace.password</name>
- <!--
- change this to the root user's password, and/or change the user below
- -->
- <value>secret</value>
- </property>
-
- <property>
- <name>trace.user</name>
- <value>root</value>
- </property>
+ <property>
+ <name>tserver.cache.data.size</name>
+ <value>128M</value>
+ </property>
- <property>
- <name>general.classpaths</name>
+ <property>
+ <name>tserver.cache.index.size</name>
+ <value>128M</value>
+ </property>
+
+ <property>
+ <name>trace.token.property.password</name>
+ <!-- change this to the root user's password, and/or change the user below -->
+ <value>secret</value>
+ </property>
+
+ <property>
+ <name>trace.user</name>
+ <value>root</value>
+ </property>
+
+ <property>
+ <name>general.classpaths</name>
<!--
- Add the following for hadoop-2.0
+ Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+ This list may be excessive, but this should cause no issues.
+
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ /usr/lib/hadoop/.*.jar,
+ /usr/lib/hadoop/lib/.*.jar,
+ /usr/lib/hadoop-hdfs/.*.jar,
+ /usr/lib/hadoop-mapreduce/.*.jar,
+ /usr/lib/hadoop-yarn/.*.jar,
-->
- <value>
- $ACCUMULO_HOME/src/server/target/classes/,
- $ACCUMULO_HOME/src/core/target/classes/,
- $ACCUMULO_HOME/src/start/target/classes/,
- $ACCUMULO_HOME/src/examples/target/classes/,
- $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
- $ACCUMULO_HOME/lib/[^.].*.jar,
- $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
- $HADOOP_CONF_DIR,
- $HADOOP_PREFIX/[^.].*.jar,
- $HADOOP_PREFIX/lib/[^.].*.jar,
- </value>
- <description>Classpaths that accumulo checks for updates and class files.
+ <value>
+ $ACCUMULO_HOME/server/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-server.jar,
+ $ACCUMULO_HOME/core/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-core.jar,
+ $ACCUMULO_HOME/start/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-start.jar,
+ $ACCUMULO_HOME/fate/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-fate.jar,
+ $ACCUMULO_HOME/proxy/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-proxy.jar,
+ $ACCUMULO_HOME/lib/[^.].*.jar,
+ $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+ $HADOOP_CONF_DIR,
+ $HADOOP_PREFIX/[^.].*.jar,
+ $HADOOP_PREFIX/lib/[^.].*.jar,
+ </value>
+ <description>Classpaths that accumulo checks for updates and class files.
When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
- </property>
-
+ </description>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bed9404/conf/examples/3GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/3GB/standalone/accumulo-site.xml
index 1080f1b,1e99a93..8616cf0
--- a/conf/examples/3GB/standalone/accumulo-site.xml
+++ b/conf/examples/3GB/standalone/accumulo-site.xml
@@@ -18,94 -18,97 +18,101 @@@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<configuration>
- <!--
- Put your site-specific accumulo configurations here.
+ <!-- Put your site-specific accumulo configurations here. The available configuration values along with their defaults are documented in docs/config.html Unless
+ you are simply testing at your workstation, you will most definitely need to change the three entries below. -->
- The available configuration values along with their defaults
- are documented in docs/config.html
+ <property>
+ <name>instance.zookeeper.host</name>
+ <value>localhost:2181</value>
+ <description>comma separated list of zookeeper servers</description>
+ </property>
- Unless you are simply testing at your workstation, you will most
- definitely need to change the three entries below.
- -->
+ <property>
+ <name>logger.dir.walog</name>
+ <value>walogs</value>
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
+ </description>
+ </property>
- <property>
- <name>instance.zookeeper.host</name>
- <value>localhost:2181</value>
- <description>comma separated list of zookeeper servers</description>
- </property>
+ <property>
+ <name>instance.secret</name>
+ <value>DEFAULT</value>
+ <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
+ Change it before initialization. To
+ change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
+ and then update this file.
+ </description>
+ </property>
- <property>
- <name>logger.dir.walog</name>
- <value>walogs</value>
- <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
- </property>
-
- <property>
- <name>instance.secret</name>
- <value>DEFAULT</value>
- <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
- Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd],
- and then update this file.
- </description>
- </property>
+ <property>
+ <name>tserver.memory.maps.max</name>
+ <value>1G</value>
+ </property>
- <property>
- <name>tserver.memory.maps.max</name>
- <value>1G</value>
- </property>
-
- <property>
- <name>tserver.cache.data.size</name>
- <value>50M</value>
- </property>
-
- <property>
- <name>tserver.cache.index.size</name>
- <value>512M</value>
- </property>
-
- <property>
- <name>trace.password</name>
- <!--
- change this to the root user's password, and/or change the user below
- -->
- <value>secret</value>
- </property>
-
- <property>
- <name>trace.user</name>
- <value>root</value>
- </property>
+ <property>
+ <name>tserver.memory.maps.native.enabled</name>
+ <value>false</value>
+ </property>
- <property>
- <name>general.classpaths</name>
+ <property>
+ <name>tserver.cache.data.size</name>
+ <value>128M</value>
+ </property>
+
+ <property>
+ <name>tserver.cache.index.size</name>
+ <value>128M</value>
+ </property>
+
+ <property>
+ <name>trace.token.property.password</name>
+ <!-- change this to the root user's password, and/or change the user below -->
+ <value>secret</value>
+ </property>
+
+ <property>
+ <name>trace.user</name>
+ <value>root</value>
+ </property>
+
+ <property>
+ <name>general.classpaths</name>
<!--
- Add the following for hadoop-2.0
+ Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+ This list may be excessive, but this should cause no issues.
+
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ /usr/lib/hadoop/.*.jar,
+ /usr/lib/hadoop/lib/.*.jar,
+ /usr/lib/hadoop-hdfs/.*.jar,
+ /usr/lib/hadoop-mapreduce/.*.jar,
+ /usr/lib/hadoop-yarn/.*.jar,
-->
- <value>
- $ACCUMULO_HOME/src/server/target/classes/,
- $ACCUMULO_HOME/src/core/target/classes/,
- $ACCUMULO_HOME/src/start/target/classes/,
- $ACCUMULO_HOME/src/examples/target/classes/,
- $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
- $ACCUMULO_HOME/lib/[^.].*.jar,
- $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
- $HADOOP_CONF_DIR,
- $HADOOP_PREFIX/[^.].*.jar,
- $HADOOP_PREFIX/lib/[^.].*.jar,
- </value>
- <description>Classpaths that accumulo checks for updates and class files.
+ <value>
+ $ACCUMULO_HOME/server/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-server.jar,
+ $ACCUMULO_HOME/core/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-core.jar,
+ $ACCUMULO_HOME/start/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-start.jar,
+ $ACCUMULO_HOME/fate/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-fate.jar,
+ $ACCUMULO_HOME/proxy/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-proxy.jar,
+ $ACCUMULO_HOME/lib/[^.].*.jar,
+ $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+ $HADOOP_CONF_DIR,
+ $HADOOP_PREFIX/[^.].*.jar,
+ $HADOOP_PREFIX/lib/[^.].*.jar,
+ </value>
+ <description>Classpaths that accumulo checks for updates and class files.
When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
- </property>
-
+ </description>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bed9404/conf/examples/512MB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/512MB/native-standalone/accumulo-site.xml
index f8d1efb,2b9584c..29317f3
--- a/conf/examples/512MB/native-standalone/accumulo-site.xml
+++ b/conf/examples/512MB/native-standalone/accumulo-site.xml
@@@ -18,99 -18,107 +18,106 @@@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<configuration>
- <!--
- Put your site-specific accumulo configurations here.
+ <!-- Put your site-specific accumulo configurations here. The available configuration values along with their defaults are documented in docs/config.html Unless
+ you are simply testing at your workstation, you will most definitely need to change the three entries below. -->
- The available configuration values along with their defaults
- are documented in docs/config.html
+ <property>
+ <name>instance.zookeeper.host</name>
+ <value>localhost:2181</value>
+ <description>comma separated list of zookeeper servers</description>
+ </property>
- Unless you are simply testing at your workstation, you will most
- definitely need to change the three entries below.
- -->
+ <property>
+ <name>logger.dir.walog</name>
+ <value>walogs</value>
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
+ </description>
+ </property>
- <property>
- <name>instance.zookeeper.host</name>
- <value>localhost:2181</value>
- <description>comma separated list of zookeeper servers</description>
- </property>
+ <property>
+ <name>instance.secret</name>
+ <value>DEFAULT</value>
+ <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
+ Change it before initialization. To
+ change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
+ and then update this file.
+ </description>
+ </property>
- <property>
- <name>logger.dir.walog</name>
- <value>walogs</value>
- <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
- </property>
-
- <property>
- <name>instance.secret</name>
- <value>DEFAULT</value>
- <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
- Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd],
- and then update this file.
- </description>
- </property>
+ <property>
+ <name>tserver.memory.maps.max</name>
+ <value>80M</value>
+ </property>
- <property>
- <name>tserver.memory.maps.max</name>
- <value>80M</value>
- </property>
-
- <property>
- <name>tserver.cache.data.size</name>
- <value>7M</value>
- </property>
-
- <property>
- <name>tserver.cache.index.size</name>
- <value>20M</value>
- </property>
-
- <property>
- <name>trace.password</name>
- <!--
- change this to the root user's password, and/or change the user below
- -->
- <value>secret</value>
- </property>
-
- <property>
- <name>trace.user</name>
- <value>root</value>
- </property>
+ <property>
+ <name>tserver.cache.data.size</name>
+ <value>7M</value>
+ </property>
- <property>
- <name>logger.sort.buffer.size</name>
- <value>50M</value>
- </property>
+ <property>
+ <name>tserver.cache.index.size</name>
+ <value>20M</value>
+ </property>
- <property>
- <name>tserver.walog.max.size</name>
- <value>100M</value>
- </property>
+ <property>
+ <name>trace.token.property.password</name>
+ <!-- change this to the root user's password, and/or change the user below -->
+ <value>secret</value>
+ </property>
- <property>
- <name>general.classpaths</name>
+ <property>
+ <name>trace.user</name>
+ <value>root</value>
+ </property>
+
+ <property>
+ <name>tserver.sort.buffer.size</name>
+ <value>50M</value>
+ </property>
+
+ <property>
+ <name>tserver.walog.max.size</name>
+ <value>100M</value>
+ </property>
+
+ <property>
+ <name>general.classpaths</name>
<!--
- Add the following for hadoop-2.0
+ Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+ This list may be excessive, but this should cause no issues.
+
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ /usr/lib/hadoop/.*.jar,
+ /usr/lib/hadoop/lib/.*.jar,
+ /usr/lib/hadoop-hdfs/.*.jar,
+ /usr/lib/hadoop-mapreduce/.*.jar,
+ /usr/lib/hadoop-yarn/.*.jar,
-->
- <value>
- $ACCUMULO_HOME/src/server/target/classes/,
- $ACCUMULO_HOME/src/core/target/classes/,
- $ACCUMULO_HOME/src/start/target/classes/,
- $ACCUMULO_HOME/src/examples/target/classes/,
- $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
- $ACCUMULO_HOME/lib/[^.].*.jar,
- $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
- $HADOOP_CONF_DIR,
- $HADOOP_PREFIX/[^.].*.jar,
- $HADOOP_PREFIX/lib/[^.].*.jar,
- </value>
- <description>Classpaths that accumulo checks for updates and class files.
+ <value>
+ $ACCUMULO_HOME/server/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-server.jar,
+ $ACCUMULO_HOME/core/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-core.jar,
+ $ACCUMULO_HOME/start/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-start.jar,
+ $ACCUMULO_HOME/fate/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-fate.jar,
+ $ACCUMULO_HOME/proxy/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-proxy.jar,
+ $ACCUMULO_HOME/lib/[^.].*.jar,
+ $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+ $HADOOP_CONF_DIR,
+ $HADOOP_PREFIX/[^.].*.jar,
+ $HADOOP_PREFIX/lib/[^.].*.jar,
+ </value>
+ <description>Classpaths that accumulo checks for updates and class files.
When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
- </property>
-
+ </description>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bed9404/conf/examples/512MB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/512MB/standalone/accumulo-site.xml
index de07cd4,a312a87..b296497
--- a/conf/examples/512MB/standalone/accumulo-site.xml
+++ b/conf/examples/512MB/standalone/accumulo-site.xml
@@@ -18,105 -18,107 +18,112 @@@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<configuration>
- <!--
- Put your site-specific accumulo configurations here.
-
- The available configuration values along with their defaults
- are documented in docs/config.html
-
- Unless you are simply testing at your workstation, you will most
- definitely need to change the three entries below.
- -->
-
- <property>
- <name>instance.zookeeper.host</name>
- <value>localhost:2181</value>
- <description>comma separated list of zookeeper servers</description>
- </property>
-
- <property>
- <name>logger.dir.walog</name>
- <value>walogs</value>
- <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
- </property>
-
- <property>
- <name>instance.secret</name>
- <value>DEFAULT</value>
- <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
- Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd],
- and then update this file.
- </description>
- </property>
-
- <property>
- <name>tserver.memory.maps.max</name>
- <value>80M</value>
- </property>
-
- <property>
- <name>tserver.cache.data.size</name>
- <value>7M</value>
- </property>
-
- <property>
- <name>tserver.cache.index.size</name>
- <value>20M</value>
- </property>
-
- <property>
- <name>trace.password</name>
- <!--
- change this to the root user's password, and/or change the user below
- -->
- <value>secret</value>
- </property>
-
- <property>
- <name>trace.user</name>
- <value>root</value>
- </property>
-
- <property>
- <name>logger.sort.buffer.size</name>
- <value>50M</value>
- </property>
-
- <property>
- <name>tserver.walog.max.size</name>
- <value>100M</value>
- </property>
-
- <property>
- <name>general.classpaths</name>
+ <!-- Put your site-specific accumulo configurations here. The available configuration values along with their defaults are documented in docs/config.html Unless
+ you are simply testing at your workstation, you will most definitely need to change the three entries below. -->
+
+ <property>
+ <name>instance.zookeeper.host</name>
+ <value>localhost:2181</value>
+ <description>comma separated list of zookeeper servers</description>
+ </property>
+
+ <property>
+ <name>logger.dir.walog</name>
+ <value>walogs</value>
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
+ </description>
+ </property>
+
+ <property>
+ <name>instance.secret</name>
+ <value>DEFAULT</value>
+ <description>A secret unique to a given instance that all servers
+ must know in order to communicate with one another.
+ Change it before initialization. To
+ change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
+ and then update this file.
+ </description>
+ </property>
+
+ <property>
+ <name>tserver.memory.maps.max</name>
+ <value>80M</value>
+ </property>
+
+ <property>
+ <name>tserver.memory.maps.native.enabled</name>
+ <value>false</value>
+ </property>
+
+ <property>
+ <name>tserver.cache.data.size</name>
+ <value>7M</value>
+ </property>
+
+ <property>
+ <name>tserver.cache.index.size</name>
+ <value>20M</value>
+ </property>
+
+ <property>
+ <name>trace.token.property.password</name>
+ <!-- change this to the root user's password, and/or change the user below -->
+ <value>secret</value>
+ </property>
+
+ <property>
+ <name>trace.user</name>
+ <value>root</value>
+ </property>
+
+ <property>
+ <name>tserver.sort.buffer.size</name>
+ <value>50M</value>
+ </property>
+
+ <property>
+ <name>tserver.walog.max.size</name>
+ <value>100M</value>
+ </property>
+
+ <property>
+ <name>general.classpaths</name>
<!--
- Add the following for hadoop-2.0
+ Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+ This list may be excessive, but this should cause no issues.
+
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ /usr/lib/hadoop/.*.jar,
+ /usr/lib/hadoop/lib/.*.jar,
+ /usr/lib/hadoop-hdfs/.*.jar,
+ /usr/lib/hadoop-mapreduce/.*.jar,
+ /usr/lib/hadoop-yarn/.*.jar,
-->
- <value>
- $ACCUMULO_HOME/src/server/target/classes/,
- $ACCUMULO_HOME/src/core/target/classes/,
- $ACCUMULO_HOME/src/start/target/classes/,
- $ACCUMULO_HOME/src/examples/target/classes/,
- $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
- $ACCUMULO_HOME/lib/[^.].*.jar,
- $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
- $HADOOP_CONF_DIR,
- $HADOOP_PREFIX/[^.].*.jar,
- $HADOOP_PREFIX/lib/[^.].*.jar,
- </value>
- <description>Classpaths that accumulo checks for updates and class files.
+ <value>
+ $ACCUMULO_HOME/server/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-server.jar,
+ $ACCUMULO_HOME/core/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-core.jar,
+ $ACCUMULO_HOME/start/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-start.jar,
+ $ACCUMULO_HOME/fate/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-fate.jar,
+ $ACCUMULO_HOME/proxy/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-proxy.jar,
+ $ACCUMULO_HOME/lib/[^.].*.jar,
+ $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+ $HADOOP_CONF_DIR,
+ $HADOOP_PREFIX/[^.].*.jar,
+ $HADOOP_PREFIX/lib/[^.].*.jar,
+ </value>
+ <description>Classpaths that accumulo checks for updates and class files.
When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
- </property>
-
+ </description>
+ </property>
</configuration>
[03/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java
1.6 should already interpolate correctly due to changes in Property and AccumuloConfiguration.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/81481342
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81481342
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81481342
Branch: refs/heads/master
Commit: 814813421af9fee2c5f361588224d336919cd7b0
Parents: f228caf 001fdd6
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 18 17:02:07 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 18 17:02:07 2013 -0500
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/core/security/SecurityUtil.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/81481342/core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java
index 4ffcc36,672e784..59c1974
--- a/core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java
@@@ -29,7 -29,9 +29,8 @@@ import org.apache.log4j.Logger
*/
public class SecurityUtil {
private static final Logger log = Logger.getLogger(SecurityUtil.class);
- private static final String ACCUMULO_HOME = "ACCUMULO_HOME", ACCUMULO_CONF_DIR = "ACCUMULO_CONF_DIR";
public static boolean usingKerberos = false;
+
/**
* This method is for logging a server in kerberos. If this is used in client code, it will fail unless run as the accumulo keytab's owner. Instead, use
* {@link #login(String, String)}
[06/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
conf/examples/1GB/native-standalone/accumulo-site.xml
conf/examples/1GB/standalone/accumulo-site.xml
conf/examples/2GB/native-standalone/accumulo-site.xml
conf/examples/2GB/standalone/accumulo-site.xml
conf/examples/3GB/native-standalone/accumulo-site.xml
conf/examples/3GB/standalone/accumulo-site.xml
conf/examples/512MB/native-standalone/accumulo-site.xml
conf/examples/512MB/standalone/accumulo-site.xml
Also updated the vfs-classloader and crypto example configs
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5d952c74
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5d952c74
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5d952c74
Branch: refs/heads/master
Commit: 5d952c7485f1aecdb41b6f2a926d36cba6e1c972
Parents: 8148134 4bed940
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 18 20:02:22 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 18 20:02:22 2013 -0500
----------------------------------------------------------------------
.../1GB/native-standalone/accumulo-site.xml | 5 +
conf/examples/1GB/standalone/accumulo-site.xml | 5 +
.../2GB/native-standalone/accumulo-site.xml | 5 +
conf/examples/2GB/standalone/accumulo-site.xml | 123 ++++++++++---------
.../3GB/native-standalone/accumulo-site.xml | 5 +
conf/examples/3GB/standalone/accumulo-site.xml | 5 +
.../512MB/native-standalone/accumulo-site.xml | 5 +
.../examples/512MB/standalone/accumulo-site.xml | 5 +
conf/examples/crypto/accumulo-site.xml | 5 +
conf/examples/vfs-classloader/accumulo-site.xml | 5 +
10 files changed, 109 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/1GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/1GB/native-standalone/accumulo-site.xml
index aaef665,9cb169f..44042e6
--- a/conf/examples/1GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/1GB/native-standalone/accumulo-site.xml
@@@ -88,24 -88,32 +88,29 @@@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
- <!--
- Add the following for Hadoop2, actual needs depend on Hadoop installation details.
- This list may be excessive, but this should cause no issues.
-
- $HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
- $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
- $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
- $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
- /usr/lib/hadoop/.*.jar,
- /usr/lib/hadoop/lib/.*.jar,
- /usr/lib/hadoop-hdfs/.*.jar,
- /usr/lib/hadoop-mapreduce/.*.jar,
- /usr/lib/hadoop-yarn/.*.jar,
- -->
<value>
- $ACCUMULO_HOME/server/target/classes/,
+ <!-- Comment the following for hadoop-1.2 -->
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
++ /usr/lib/hadoop/.*.jar,
++ /usr/lib/hadoop/lib/.*.jar,
++ /usr/lib/hadoop-hdfs/.*.jar,
++ /usr/lib/hadoop-mapreduce/.*.jar,
++ /usr/lib/hadoop-yarn/.*.jar,
+
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/1GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/1GB/standalone/accumulo-site.xml
index 843a24d,399a497..e32d143
--- a/conf/examples/1GB/standalone/accumulo-site.xml
+++ b/conf/examples/1GB/standalone/accumulo-site.xml
@@@ -88,24 -88,32 +88,29 @@@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
- <!--
- Add the following for Hadoop2, actual needs depend on Hadoop installation details.
- This list may be excessive, but this should cause no issues.
-
- $HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
- $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
- $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
- $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
- /usr/lib/hadoop/.*.jar,
- /usr/lib/hadoop/lib/.*.jar,
- /usr/lib/hadoop-hdfs/.*.jar,
- /usr/lib/hadoop-mapreduce/.*.jar,
- /usr/lib/hadoop-yarn/.*.jar,
- -->
<value>
- $ACCUMULO_HOME/server/target/classes/,
+ <!-- Comment the following for hadoop-1.2 -->
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
++ /usr/lib/hadoop/.*.jar,
++ /usr/lib/hadoop/lib/.*.jar,
++ /usr/lib/hadoop-hdfs/.*.jar,
++ /usr/lib/hadoop-mapreduce/.*.jar,
++ /usr/lib/hadoop-yarn/.*.jar,
+
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/2GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/2GB/native-standalone/accumulo-site.xml
index 49a44e3,d754ea9..9f308a2
--- a/conf/examples/2GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/2GB/native-standalone/accumulo-site.xml
@@@ -78,24 -78,32 +78,29 @@@
</property>
<property>
- <name>general.classpaths</name>
- <!--
- Add the following for Hadoop2, actual needs depend on Hadoop installation details.
- This list may be excessive, but this should cause no issues.
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
- $HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
- $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
- $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
- $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
- /usr/lib/hadoop/.*.jar,
- /usr/lib/hadoop/lib/.*.jar,
- /usr/lib/hadoop-hdfs/.*.jar,
- /usr/lib/hadoop-mapreduce/.*.jar,
- /usr/lib/hadoop-yarn/.*.jar,
- -->
+ <property>
+ <name>general.classpaths</name>
<value>
- $ACCUMULO_HOME/server/target/classes/,
+ <!-- Comment the following for hadoop-1.2 -->
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
++ /usr/lib/hadoop/.*.jar,
++ /usr/lib/hadoop/lib/.*.jar,
++ /usr/lib/hadoop-hdfs/.*.jar,
++ /usr/lib/hadoop-mapreduce/.*.jar,
++ /usr/lib/hadoop-yarn/.*.jar,
+
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/2GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/2GB/standalone/accumulo-site.xml
index 4e244b7,795592d..b6546e5
--- a/conf/examples/2GB/standalone/accumulo-site.xml
+++ b/conf/examples/2GB/standalone/accumulo-site.xml
@@@ -26,89 -26,97 +26,94 @@@
Unless you are simply testing at your workstation, you will most
definitely need to change the three entries below.
- -->
+ -->
- <property>
- <name>instance.zookeeper.host</name>
- <value>localhost:2181</value>
- <description>comma separated list of zookeeper servers</description>
- </property>
+ <property>
+ <name>instance.zookeeper.host</name>
+ <value>localhost:2181</value>
+ <description>comma separated list of zookeeper servers</description>
+ </property>
- <property>
- <name>logger.dir.walog</name>
- <value>walogs</value>
- <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
- filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
- write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
+ <property>
+ <name>logger.dir.walog</name>
+ <value>walogs</value>
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
+ </description>
+ </property>
+
+ <property>
+ <name>instance.secret</name>
+ <value>DEFAULT</value>
+ <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
+ Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
+ and then update this file.
</description>
- </property>
-
- <property>
- <name>instance.secret</name>
- <value>DEFAULT</value>
- <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
- Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
- and then update this file.
- </description>
- </property>
+ </property>
- <property>
- <name>tserver.memory.maps.max</name>
- <value>512M</value>
- </property>
-
- <property>
- <name>tserver.memory.maps.native.enabled</name>
- <value>false</value>
- </property>
+ <property>
+ <name>tserver.memory.maps.max</name>
+ <value>512M</value>
+ </property>
+
+ <property>
+ <name>tserver.memory.maps.native.enabled</name>
+ <value>false</value>
+ </property>
- <property>
- <name>tserver.cache.data.size</name>
- <value>30M</value>
- </property>
-
- <property>
- <name>tserver.cache.index.size</name>
- <value>80M</value>
- </property>
-
- <property>
- <name>trace.token.property.password</name>
- <!--
- change this to the root user's password, and/or change the user below
- -->
- <value>secret</value>
- </property>
-
- <property>
- <name>trace.user</name>
- <value>root</value>
- </property>
-
- <property>
- <name>tserver.walog.max.size</name>
- <value>512M</value>
- </property>
+ <property>
+ <name>tserver.cache.data.size</name>
+ <value>30M</value>
+ </property>
+
+ <property>
+ <name>tserver.cache.index.size</name>
+ <value>80M</value>
+ </property>
+
+ <property>
+ <name>trace.token.property.password</name>
+ <!--
+ change this to the root user's password, and/or change the user below
+ -->
+ <value>secret</value>
+ </property>
+
+ <property>
+ <name>trace.user</name>
+ <value>root</value>
+ </property>
+
+ <property>
+ <name>tserver.walog.max.size</name>
+ <value>512M</value>
+ </property>
<property>
- <name>general.classpaths</name>
- <!--
- Add the following for Hadoop2, actual needs depend on Hadoop installation details.
- This list may be excessive, but this should cause no issues.
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+ <property>
+ <name>general.classpaths</name>
+ <value>
+ <!-- Comment the following for hadoop-1.2 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ /usr/lib/hadoop/.*.jar,
+ /usr/lib/hadoop/lib/.*.jar,
+ /usr/lib/hadoop-hdfs/.*.jar,
+ /usr/lib/hadoop-mapreduce/.*.jar,
+ /usr/lib/hadoop-yarn/.*.jar,
- -->
- <value>
- $ACCUMULO_HOME/server/target/classes/,
+
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/3GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/3GB/native-standalone/accumulo-site.xml
index ac6d2ae,d603095..2ad5885
--- a/conf/examples/3GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/3GB/native-standalone/accumulo-site.xml
@@@ -73,24 -73,32 +73,29 @@@
</property>
<property>
- <name>general.classpaths</name>
- <!--
- Add the following for Hadoop2, actual needs depend on Hadoop installation details.
- This list may be excessive, but this should cause no issues.
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
- $HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
- $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
- $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
- $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
- /usr/lib/hadoop/.*.jar,
- /usr/lib/hadoop/lib/.*.jar,
- /usr/lib/hadoop-hdfs/.*.jar,
- /usr/lib/hadoop-mapreduce/.*.jar,
- /usr/lib/hadoop-yarn/.*.jar,
- -->
+ <property>
+ <name>general.classpaths</name>
<value>
- $ACCUMULO_HOME/server/target/classes/,
+ <!-- Comment the following for hadoop-1.2 -->
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
++ /usr/lib/hadoop/.*.jar,
++ /usr/lib/hadoop/lib/.*.jar,
++ /usr/lib/hadoop-hdfs/.*.jar,
++ /usr/lib/hadoop-mapreduce/.*.jar,
++ /usr/lib/hadoop-yarn/.*.jar,
+
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/3GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/3GB/standalone/accumulo-site.xml
index 5f81dac,8616cf0..55edfec
--- a/conf/examples/3GB/standalone/accumulo-site.xml
+++ b/conf/examples/3GB/standalone/accumulo-site.xml
@@@ -78,24 -78,32 +78,29 @@@
</property>
<property>
- <name>general.classpaths</name>
- <!--
- Add the following for Hadoop2, actual needs depend on Hadoop installation details.
- This list may be excessive, but this should cause no issues.
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
- $HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
- $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
- $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
- $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
- /usr/lib/hadoop/.*.jar,
- /usr/lib/hadoop/lib/.*.jar,
- /usr/lib/hadoop-hdfs/.*.jar,
- /usr/lib/hadoop-mapreduce/.*.jar,
- /usr/lib/hadoop-yarn/.*.jar,
- -->
+ <property>
+ <name>general.classpaths</name>
<value>
- $ACCUMULO_HOME/server/target/classes/,
+ <!-- Comment the following for hadoop-1.2 -->
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
++ /usr/lib/hadoop/.*.jar,
++ /usr/lib/hadoop/lib/.*.jar,
++ /usr/lib/hadoop-hdfs/.*.jar,
++ /usr/lib/hadoop-mapreduce/.*.jar,
++ /usr/lib/hadoop-yarn/.*.jar,
+
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/512MB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/512MB/native-standalone/accumulo-site.xml
index 09e3e30,29317f3..cd25aa8
--- a/conf/examples/512MB/native-standalone/accumulo-site.xml
+++ b/conf/examples/512MB/native-standalone/accumulo-site.xml
@@@ -83,24 -83,32 +83,29 @@@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
- <!--
- Add the following for Hadoop2, actual needs depend on Hadoop installation details.
- This list may be excessive, but this should cause no issues.
-
- $HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
- $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
- $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
- $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
- /usr/lib/hadoop/.*.jar,
- /usr/lib/hadoop/lib/.*.jar,
- /usr/lib/hadoop-hdfs/.*.jar,
- /usr/lib/hadoop-mapreduce/.*.jar,
- /usr/lib/hadoop-yarn/.*.jar,
- -->
<value>
- $ACCUMULO_HOME/server/target/classes/,
+ <!-- Comment the following for hadoop-1.2 -->
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
++ /usr/lib/hadoop/.*.jar,
++ /usr/lib/hadoop/lib/.*.jar,
++ /usr/lib/hadoop-hdfs/.*.jar,
++ /usr/lib/hadoop-mapreduce/.*.jar,
++ /usr/lib/hadoop-yarn/.*.jar,
+
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/512MB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/512MB/standalone/accumulo-site.xml
index e6ed6de,b296497..b1d5470
--- a/conf/examples/512MB/standalone/accumulo-site.xml
+++ b/conf/examples/512MB/standalone/accumulo-site.xml
@@@ -89,24 -89,32 +89,29 @@@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
- <!--
- Add the following for Hadoop2, actual needs depend on Hadoop installation details.
- This list may be excessive, but this should cause no issues.
-
- $HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
- $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
- $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
- $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
- /usr/lib/hadoop/.*.jar,
- /usr/lib/hadoop/lib/.*.jar,
- /usr/lib/hadoop-hdfs/.*.jar,
- /usr/lib/hadoop-mapreduce/.*.jar,
- /usr/lib/hadoop-yarn/.*.jar,
- -->
<value>
- $ACCUMULO_HOME/server/target/classes/,
+ <!-- Comment the following for hadoop-1.2 -->
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
++ /usr/lib/hadoop/.*.jar,
++ /usr/lib/hadoop/lib/.*.jar,
++ /usr/lib/hadoop-hdfs/.*.jar,
++ /usr/lib/hadoop-mapreduce/.*.jar,
++ /usr/lib/hadoop-yarn/.*.jar,
+
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/crypto/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/crypto/accumulo-site.xml
index 1975fed,0000000..39a385b
mode 100644,000000..100644
--- a/conf/examples/crypto/accumulo-site.xml
+++ b/conf/examples/crypto/accumulo-site.xml
@@@ -1,167 -1,0 +1,172 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<configuration>
+ <!--
+ Put your site-specific accumulo configurations here.
+
+ The available configuration values along with their defaults
+ are documented in docs/config.html
+
+ Unless you are simply testing at your workstation, you will most
+ definitely need to change the three entries below.
+ -->
+
+ <property>
+ <name>instance.zookeeper.host</name>
+ <value>localhost:2181</value>
+ <description>comma separated list of zookeeper servers</description>
+ </property>
+
+ <property>
+ <name>logger.dir.walog</name>
+ <value>walogs</value>
+ <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
+ </property>
+
+ <property>
+ <name>instance.secret</name>
+ <value>DEFAULT</value>
+ <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
+ Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd],
+ and then update this file.
+ </description>
+ </property>
+
+ <property>
+ <name>tserver.memory.maps.max</name>
+ <value>80M</value>
+ </property>
+
+ <property>
+ <name>tserver.cache.data.size</name>
+ <value>7M</value>
+ </property>
+
+ <property>
+ <name>tserver.cache.index.size</name>
+ <value>20M</value>
+ </property>
+
+ <property>
+ <name>trace.password</name>
+ <!--
+ change this to the root user's password, and/or change the user below
+ -->
+ <value>password</value>
+ </property>
+
+ <property>
+ <name>trace.user</name>
+ <value>root</value>
+ </property>
+
+ <property>
+ <name>tserver.sort.buffer.size</name>
+ <value>50M</value>
+ </property>
+
+ <property>
+ <name>tserver.walog.max.size</name>
+ <value>100M</value>
+ </property>
+
+ <property>
+ <name>general.classpaths</name>
+ <value>
+ <!-- Comment the following for hadoop-1.2 -->
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
++ /usr/lib/hadoop/.*.jar,
++ /usr/lib/hadoop/lib/.*.jar,
++ /usr/lib/hadoop-hdfs/.*.jar,
++ /usr/lib/hadoop-mapreduce/.*.jar,
++ /usr/lib/hadoop-yarn/.*.jar,
+
+ $ACCUMULO_HOME/server/target/classes/,
+ $ACCUMULO_HOME/core/target/classes/,
+ $ACCUMULO_HOME/start/target/classes/,
+ $ACCUMULO_HOME/fate/target/classes/,
+ $ACCUMULO_HOME/proxy/target/classes/,
+ $ACCUMULO_HOME/examples/target/classes/,
+ $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
+ $ACCUMULO_HOME/lib/[^.].*.jar,
+ $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+ $HADOOP_CONF_DIR,
+ $HADOOP_PREFIX/[^.].*.jar,
+ $HADOOP_PREFIX/lib/[^.].*.jar,
+ </value>
+ <description>Classpaths that accumulo checks for updates and class files.
+ When using the Security Manager, please remove the ".../target/classes/" values.
+ </description>
+ </property>
+
+ <property>
+ <name>crypto.module.class</name>
+ <value>org.apache.accumulo.core.security.crypto.DefaultCryptoModule</value>
+ </property>
+ <property>
+ <name>crypto.cipher.suite</name>
+ <value>AES/CFB/PKCS5Padding</value>
+ </property>
+ <property>
+ <name>crypto.cipher.algorithm.name</name>
+ <value>AES</value>
+ </property>
+ <property>
+ <name>crypto.cipher.key.length</name>
+ <value>128</value>
+ </property>
+ <property>
+ <name>crypto.secure.rng</name>
+ <value>SHA1PRNG</value>
+ </property>
+ <property>
+ <name>crypto.secure.rng.provider</name>
+ <value>SUN</value>
+ </property>
+
+ <property>
+ <name>crypto.secret.key.encryption.strategy.class</name>
+ <value>org.apache.accumulo.core.security.crypto.DefaultSecretKeyEncryptionStrategy</value>
+ </property>
+
+ <property>
+ <name>crypto.default.key.strategy.cipher.suite</name>
+ <value>AES/ECB/NoPadding</value>
+ </property>
+<!--
+ These properties can be useful for situations where you are conducting unit tests without HDFS
+ running.
+-->
+
+<!--
+ <property>
+ <name>crypto.default.key.strategy.hdfs.uri</name>
+ <value>file:///</value>
+ </property>
+ <property>
+ <name>crypto.default.key.strategy.key.location</name>
+ <value>/tmp/test.secret.key</value>
+ </property>
+-->
+</configuration>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/vfs-classloader/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/vfs-classloader/accumulo-site.xml
index a7a43fa,9302486..4892ee1
--- a/conf/examples/vfs-classloader/accumulo-site.xml
+++ b/conf/examples/vfs-classloader/accumulo-site.xml
@@@ -83,24 -83,25 +83,29 @@@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
- <!--
- Add the following for hadoop-2.0
- $HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
- $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
- $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
- $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
- -->
<value>
- $ACCUMULO_HOME/server/target/classes/,
+ <!-- Comment the following for hadoop-1.2 -->
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
++ /usr/lib/hadoop/.*.jar,
++ /usr/lib/hadoop/lib/.*.jar,
++ /usr/lib/hadoop-hdfs/.*.jar,
++ /usr/lib/hadoop-mapreduce/.*.jar,
++ /usr/lib/hadoop-yarn/.*.jar,
+
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,