Updated Branches: refs/heads/master 2816cb9d8 -> 314117714
ACCUMULO-1652 allow user-specified command to be used when OOM errors occur Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0ae34d47 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0ae34d47 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0ae34d47 Branch: refs/heads/master Commit: 0ae34d471be2f7e4a0f7e6d548a850d1ea5223f4 Parents: c617032 Author: Eric Newton <[email protected]> Authored: Wed Sep 11 12:37:21 2013 -0400 Committer: Eric Newton <[email protected]> Committed: Wed Sep 11 12:37:21 2013 -0400 ---------------------------------------------------------------------- bin/accumulo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ae34d47/bin/accumulo ---------------------------------------------------------------------- diff --git a/bin/accumulo b/bin/accumulo index 42074b6..6642818 100755 --- a/bin/accumulo +++ b/bin/accumulo @@ -130,4 +130,4 @@ JAVA=$JAVA_HOME/bin/java PLATFORM="`$JAVA -cp $CLASSPATH org.apache.accumulo.start.Platform`" # 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" -classpath $CLASSPATH $ACCUMULO_OPTS -XX:OnOutOfMemoryError="kill -9 %p" -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl -Djava.library.path="$HADOOP_HOME/lib/native/$PLATFORM" -Dorg.apache.accumulo.core.home.dir="$ACCUMULO_HOME" -Dhadoop.home.dir="$HADOOP_HOME" -Dzookeeper.home.dir="$ZOOKEEPER_HOME" org.apache.accumulo.start.Main "$@" +exec $JAVA "-Dapp=$1" -classpath $CLASSPATH $ACCUMULO_OPTS -XX:OnOutOfMemoryError="${ACCUMULO_KILL_CMD:-kill -9 %p}" -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl -Djava.library.path="$HADOOP_HOME/lib/native/$PLATFORM" -Dorg.apache.accumulo.core.home.dir="$ACCUMULO_HOME" -Dhadoop.home.dir="$HADOOP_HOME" -Dzookeeper.home.dir="$ZOOKEEPER_HOME" org.apache.accumulo.start.Main "$@"
