Updated Branches:
  refs/heads/1.4.5-SNAPSHOT 0ae34d471 -> 05316149c
  refs/heads/1.5.1-SNAPSHOT 62425ba01 -> 0895046e3
  refs/heads/master 176df80fd -> 80b4b0760


ACCUMULO-1652 demonstrate the ACCUMULO_KILL_CMD configuration in every example 
accumulo-env.sh


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/05316149
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/05316149
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/05316149

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 05316149c9c22ae495380ac9319f8c40cda102dd
Parents: 0ae34d4
Author: Eric Newton <eric.new...@gmail.com>
Authored: Wed Sep 11 15:54:11 2013 -0400
Committer: Eric Newton <eric.new...@gmail.com>
Committed: Wed Sep 11 15:54:11 2013 -0400

----------------------------------------------------------------------
 conf/examples/1GB/native-standalone/accumulo-env.sh   | 2 ++
 conf/examples/1GB/standalone/accumulo-env.sh          | 2 ++
 conf/examples/2GB/native-standalone/accumulo-env.sh   | 2 ++
 conf/examples/2GB/standalone/accumulo-env.sh          | 2 ++
 conf/examples/3GB/native-standalone/accumulo-env.sh   | 2 ++
 conf/examples/3GB/standalone/accumulo-env.sh          | 2 ++
 conf/examples/512MB/native-standalone/accumulo-env.sh | 2 ++
 conf/examples/512MB/standalone/accumulo-env.sh        | 2 ++
 8 files changed, 16 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/05316149/conf/examples/1GB/native-standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --git a/conf/examples/1GB/native-standalone/accumulo-env.sh 
b/conf/examples/1GB/native-standalone/accumulo-env.sh
index 5410cf9..4033152 100755
--- a/conf/examples/1GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/1GB/native-standalone/accumulo-env.sh
@@ -44,3 +44,5 @@ test -z "$ACCUMULO_LOGGER_OPTS"  && export 
ACCUMULO_LOGGER_OPTS="-Xmx384m -Xms25
 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_CONF_DIR/masters ; echo 
localhost ) 2>/dev/null | head -1`
+# what do when the JVM runs out of heap memory
+export ACCUMULO_KILL_CMD='kill -9 %p'

http://git-wip-us.apache.org/repos/asf/accumulo/blob/05316149/conf/examples/1GB/standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --git a/conf/examples/1GB/standalone/accumulo-env.sh 
b/conf/examples/1GB/standalone/accumulo-env.sh
index 6214cf7..4d09467 100755
--- a/conf/examples/1GB/standalone/accumulo-env.sh
+++ b/conf/examples/1GB/standalone/accumulo-env.sh
@@ -44,3 +44,5 @@ test -z "$ACCUMULO_LOGGER_OPTS"  && export 
ACCUMULO_LOGGER_OPTS="-Xmx384m -Xms25
 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_CONF_DIR/masters ; echo 
localhost ) 2>/dev/null | head -1`
+# what do when the JVM runs out of heap memory
+export ACCUMULO_KILL_CMD='kill -9 %p'

http://git-wip-us.apache.org/repos/asf/accumulo/blob/05316149/conf/examples/2GB/native-standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --git a/conf/examples/2GB/native-standalone/accumulo-env.sh 
b/conf/examples/2GB/native-standalone/accumulo-env.sh
index 77cc243..c2346ff 100755
--- a/conf/examples/2GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/2GB/native-standalone/accumulo-env.sh
@@ -44,3 +44,5 @@ test -z "$ACCUMULO_LOGGER_OPTS"  && export 
ACCUMULO_LOGGER_OPTS="-Xmx768m -Xms25
 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_CONF_DIR/masters ; echo 
localhost ) 2>/dev/null | head -1`
+# what do when the JVM runs out of heap memory
+export ACCUMULO_KILL_CMD='kill -9 %p'

http://git-wip-us.apache.org/repos/asf/accumulo/blob/05316149/conf/examples/2GB/standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --git a/conf/examples/2GB/standalone/accumulo-env.sh 
b/conf/examples/2GB/standalone/accumulo-env.sh
index dee9937..3f6e272 100755
--- a/conf/examples/2GB/standalone/accumulo-env.sh
+++ b/conf/examples/2GB/standalone/accumulo-env.sh
@@ -44,3 +44,5 @@ test -z "$ACCUMULO_LOGGER_OPTS"  && export 
ACCUMULO_LOGGER_OPTS="-Xmx768m -Xms25
 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_CONF_DIR/masters ; echo 
localhost ) 2>/dev/null | head -1`
+# what do when the JVM runs out of heap memory
+export ACCUMULO_KILL_CMD='kill -9 %p'

http://git-wip-us.apache.org/repos/asf/accumulo/blob/05316149/conf/examples/3GB/native-standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --git a/conf/examples/3GB/native-standalone/accumulo-env.sh 
b/conf/examples/3GB/native-standalone/accumulo-env.sh
index 3014554..6fe3f3f 100755
--- a/conf/examples/3GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/3GB/native-standalone/accumulo-env.sh
@@ -44,3 +44,5 @@ 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_CONF_DIR/masters ; echo 
localhost ) 2>/dev/null | head -1`
+# what do when the JVM runs out of heap memory
+export ACCUMULO_KILL_CMD='kill -9 %p'

http://git-wip-us.apache.org/repos/asf/accumulo/blob/05316149/conf/examples/3GB/standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --git a/conf/examples/3GB/standalone/accumulo-env.sh 
b/conf/examples/3GB/standalone/accumulo-env.sh
index 23080d3..c554f61 100755
--- a/conf/examples/3GB/standalone/accumulo-env.sh
+++ b/conf/examples/3GB/standalone/accumulo-env.sh
@@ -44,3 +44,5 @@ 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_CONF_DIR/masters ; echo 
localhost ) 2>/dev/null | head -1`
+# what do when the JVM runs out of heap memory
+export ACCUMULO_KILL_CMD='kill -9 %p'

http://git-wip-us.apache.org/repos/asf/accumulo/blob/05316149/conf/examples/512MB/native-standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --git a/conf/examples/512MB/native-standalone/accumulo-env.sh 
b/conf/examples/512MB/native-standalone/accumulo-env.sh
index 49ec64d..23c77c4 100755
--- a/conf/examples/512MB/native-standalone/accumulo-env.sh
+++ b/conf/examples/512MB/native-standalone/accumulo-env.sh
@@ -44,3 +44,5 @@ test -z "$ACCUMULO_LOGGER_OPTS"  && export 
ACCUMULO_LOGGER_OPTS="-Xmx128m -Xms12
 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_CONF_DIR/masters ; echo 
localhost ) 2>/dev/null | head -1`
+# what do when the JVM runs out of heap memory
+export ACCUMULO_KILL_CMD='kill -9 %p'

http://git-wip-us.apache.org/repos/asf/accumulo/blob/05316149/conf/examples/512MB/standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --git a/conf/examples/512MB/standalone/accumulo-env.sh 
b/conf/examples/512MB/standalone/accumulo-env.sh
index e0ae73e..85a6784 100755
--- a/conf/examples/512MB/standalone/accumulo-env.sh
+++ b/conf/examples/512MB/standalone/accumulo-env.sh
@@ -44,3 +44,5 @@ test -z "$ACCUMULO_LOGGER_OPTS"  && export 
ACCUMULO_LOGGER_OPTS="-Xmx128m -Xms12
 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_CONF_DIR/masters ; echo 
localhost ) 2>/dev/null | head -1`
+# what do when the JVM runs out of heap memory
+export ACCUMULO_KILL_CMD='kill -9 %p'

Reply via email to