accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1244741 - in /incubator/accumulo/branches/1.4: ./ conf/
Date Wed, 15 Feb 2012 21:28:50 GMT
Author: vines
Date: Wed Feb 15 21:28:50 2012
New Revision: 1244741

URL: http://svn.apache.org/viewvc?rev=1244741&view=rev
Log:
Fixes ACCUMULO-390


Added:
    incubator/accumulo/branches/1.4/conf/accumulo-env.sh.1GBstandalone-example
    incubator/accumulo/branches/1.4/conf/accumulo-env.sh.2GBstandalone-example
    incubator/accumulo/branches/1.4/conf/accumulo-env.sh.3GBcluster-example
    incubator/accumulo/branches/1.4/conf/accumulo-env.sh.512MBBstandalone-example
Removed:
    incubator/accumulo/branches/1.4/conf/accumulo-env.sh.example
Modified:
    incubator/accumulo/branches/1.4/README

Modified: incubator/accumulo/branches/1.4/README
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/README?rev=1244741&r1=1244740&r2=1244741&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/README (original)
+++ incubator/accumulo/branches/1.4/README Wed Feb 15 21:28:50 2012
@@ -62,7 +62,7 @@ Create a "masters" file in $ACCUMULO_HOM
 machines where the master server will run. 
 
 Create conf/accumulo-env.sh following the template of
-conf/accumulo-env.sh.example.  Set JAVA_HOME, HADOOP_HOME, and ZOOKEEPER_HOME.
+conf/accumulo-env.sh.*-example.  Set JAVA_HOME, HADOOP_HOME, and ZOOKEEPER_HOME.The example
accumulo-env files are named based on the memory footprint for the accumulo processes, and
if that footprint is during standalone or cluster use. Please note that the footprints are
for only the Accumulo system processes, so ample space should be left for other processes
like hadoop, zookeeper, and the accumulo client code.
 These directories must be at the same location on every node in the cluster.
 Note that zookeeper must be installed on every machine, but it should not be 
 run on every machine.

Added: incubator/accumulo/branches/1.4/conf/accumulo-env.sh.1GBstandalone-example
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/conf/accumulo-env.sh.1GBstandalone-example?rev=1244741&view=auto
==============================================================================
--- incubator/accumulo/branches/1.4/conf/accumulo-env.sh.1GBstandalone-example (added)
+++ incubator/accumulo/branches/1.4/conf/accumulo-env.sh.1GBstandalone-example Wed Feb 15
21:28:50 2012
@@ -0,0 +1,46 @@
+#! /usr/bin/env bash
+
+# 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.
+
+###
+### Configure these environment variables to point to your local installations.
+###
+### The functional tests require conditional values, so keep this style:
+###
+### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/local/lib/jdk-1.6.0
+###
+###
+### Note that the -Xmx -Xms settings below require substantial free memory: 
+### you may want to use smaller values, especially when running everything
+### on a single machine.
+###
+
+test -z "$JAVA_HOME"             && export JAVA_HOME=/path/to/java
+test -z "$HADOOP_HOME"           && export HADOOP_HOME=/path/to/hadoop
+test -z "$ZOOKEEPER_HOME"        && export ZOOKEEPER_HOME=/path/to/zookeeper
+test -z "$ACCUMULO_LOG_DIR"      && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
+if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
+then
+   POLICY="-Djava.security.manager -Djava.security.policy=${ACCUMULO_HOME}/conf/accumulo.policy"
+fi
+test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY} -Xmx384m
-Xms384m -Xss128k"
+test -z "$ACCUMULO_MASTER_OPTS"  && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx128m
-Xms128m"
+test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx64m
-Xms64m" 
+test -z "$ACCUMULO_GC_OPTS"      && export ACCUMULO_GC_OPTS="-Xmx64m -Xms64m"
+test -z "$ACCUMULO_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx384m -Xms256m"
+test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75"
+test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx128m -Xms64m"
+export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/masters ; echo localhost ) 2>/dev/null
| head -1`

Added: incubator/accumulo/branches/1.4/conf/accumulo-env.sh.2GBstandalone-example
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/conf/accumulo-env.sh.2GBstandalone-example?rev=1244741&view=auto
==============================================================================
--- incubator/accumulo/branches/1.4/conf/accumulo-env.sh.2GBstandalone-example (added)
+++ incubator/accumulo/branches/1.4/conf/accumulo-env.sh.2GBstandalone-example Wed Feb 15
21:28:50 2012
@@ -0,0 +1,46 @@
+#! /usr/bin/env bash
+
+# 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.
+
+###
+### Configure these environment variables to point to your local installations.
+###
+### The functional tests require conditional values, so keep this style:
+###
+### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/local/lib/jdk-1.6.0
+###
+###
+### Note that the -Xmx -Xms settings below require substantial free memory: 
+### you may want to use smaller values, especially when running everything
+### on a single machine.
+###
+
+test -z "$JAVA_HOME"             && export JAVA_HOME=/path/to/java
+test -z "$HADOOP_HOME"           && export HADOOP_HOME=/path/to/hadoop
+test -z "$ZOOKEEPER_HOME"        && export ZOOKEEPER_HOME=/path/to/zookeeper
+test -z "$ACCUMULO_LOG_DIR"      && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
+if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
+then
+   POLICY="-Djava.security.manager -Djava.security.policy=${ACCUMULO_HOME}/conf/accumulo.policy"
+fi
+test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY} -Xmx768m
-Xms768m -Xss128k"
+test -z "$ACCUMULO_MASTER_OPTS"  && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx256m
-Xms256m"
+test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx128m
-Xms64m" 
+test -z "$ACCUMULO_GC_OPTS"      && export ACCUMULO_GC_OPTS="-Xmx128m -Xms128m"
+test -z "$ACCUMULO_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx768m -Xms256m"
+test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75"
+test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx256m -Xms64m"
+export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/masters ; echo localhost ) 2>/dev/null
| head -1`

Added: incubator/accumulo/branches/1.4/conf/accumulo-env.sh.3GBcluster-example
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/conf/accumulo-env.sh.3GBcluster-example?rev=1244741&view=auto
==============================================================================
--- incubator/accumulo/branches/1.4/conf/accumulo-env.sh.3GBcluster-example (added)
+++ incubator/accumulo/branches/1.4/conf/accumulo-env.sh.3GBcluster-example Wed Feb 15 21:28:50
2012
@@ -0,0 +1,46 @@
+#! /usr/bin/env bash
+
+# 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.
+
+###
+### Configure these environment variables to point to your local installations.
+###
+### The functional tests require conditional values, so keep this style:
+###
+### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/local/lib/jdk-1.6.0
+###
+###
+### Note that the -Xmx -Xms settings below require substantial free memory: 
+### you may want to use smaller values, especially when running everything
+### on a single machine.
+###
+
+test -z "$JAVA_HOME"             && export JAVA_HOME=/path/to/java
+test -z "$HADOOP_HOME"           && export HADOOP_HOME=/path/to/hadoop
+test -z "$ZOOKEEPER_HOME"        && export ZOOKEEPER_HOME=/path/to/zookeeper
+test -z "$ACCUMULO_LOG_DIR"      && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
+if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
+then
+   POLICY="-Djava.security.manager -Djava.security.policy=${ACCUMULO_HOME}/conf/accumulo.policy"
+fi
+test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY} -Xmx3g
-Xms3g -Xss128k"
+test -z "$ACCUMULO_MASTER_OPTS"  && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx1g
-Xms1g"
+test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx1g
-Xms256m" 
+test -z "$ACCUMULO_GC_OPTS"      && export ACCUMULO_GC_OPTS="-Xmx256m -Xms256m"
+test -z "$ACCUMULO_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx1g -Xms256m"
+test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75"
+test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx1g -Xms256m"
+export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/masters ; echo localhost ) 2>/dev/null
| head -1`

Added: incubator/accumulo/branches/1.4/conf/accumulo-env.sh.512MBBstandalone-example
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/conf/accumulo-env.sh.512MBBstandalone-example?rev=1244741&view=auto
==============================================================================
--- incubator/accumulo/branches/1.4/conf/accumulo-env.sh.512MBBstandalone-example (added)
+++ incubator/accumulo/branches/1.4/conf/accumulo-env.sh.512MBBstandalone-example Wed Feb
15 21:28:50 2012
@@ -0,0 +1,46 @@
+#! /usr/bin/env bash
+
+# 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.
+
+###
+### Configure these environment variables to point to your local installations.
+###
+### The functional tests require conditional values, so keep this style:
+###
+### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/local/lib/jdk-1.6.0
+###
+###
+### Note that the -Xmx -Xms settings below require substantial free memory: 
+### you may want to use smaller values, especially when running everything
+### on a single machine.
+###
+
+test -z "$JAVA_HOME"             && export JAVA_HOME=/path/to/java
+test -z "$HADOOP_HOME"           && export HADOOP_HOME=/path/to/hadoop
+test -z "$ZOOKEEPER_HOME"        && export ZOOKEEPER_HOME=/path/to/zookeeper
+test -z "$ACCUMULO_LOG_DIR"      && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
+if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
+then
+   POLICY="-Djava.security.manager -Djava.security.policy=${ACCUMULO_HOME}/conf/accumulo.policy"
+fi
+test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY} -Xmx128m
-Xms128m -Xss128k"
+test -z "$ACCUMULO_MASTER_OPTS"  && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx128m
-Xms128m"
+test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx64m
-Xms64m" 
+test -z "$ACCUMULO_GC_OPTS"      && export ACCUMULO_GC_OPTS="-Xmx64m -Xms64m"
+test -z "$ACCUMULO_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx128m -Xms128m"
+test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75"
+test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx128m -Xms64m"
+export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/masters ; echo localhost ) 2>/dev/null
| head -1`



Mime
View raw message