Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 350809ECC for ; Wed, 10 Oct 2012 19:44:27 +0000 (UTC) Received: (qmail 39187 invoked by uid 500); 10 Oct 2012 19:44:27 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 39155 invoked by uid 500); 10 Oct 2012 19:44:27 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 39148 invoked by uid 99); 10 Oct 2012 19:44:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Oct 2012 19:44:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Oct 2012 19:44:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 05ABE23889B8 for ; Wed, 10 Oct 2012 19:43:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1396760 - in /accumulo/trunk: ./ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/ conf/examples/3GB/native-standalone/ conf/examples/3GB/standalone/ conf/... Date: Wed, 10 Oct 2012 19:43:38 -0000 To: commits@accumulo.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121010194339.05ABE23889B8@eris.apache.org> Author: ecn Date: Wed Oct 10 19:43:37 2012 New Revision: 1396760 URL: http://svn.apache.org/viewvc?rev=1396760&view=rev Log: ACCUMULO-798 remove stack size and limit NewGen space in the larger configs Modified: accumulo/trunk/ (props changed) accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh accumulo/trunk/core/ (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/src/ (props changed) Propchange: accumulo/trunk/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4:r1396758 Modified: accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh?rev=1396760&r1=1396759&r2=1396760&view=diff ============================================================================== --- accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh (original) +++ accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh Wed Oct 10 19:43:37 2012 @@ -36,7 +36,7 @@ if [ -f ${ACCUMULO_HOME}/conf/accumulo.p 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 -Xss160k" +test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY} -Xmx128m -Xms128m " 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" Modified: accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh?rev=1396760&r1=1396759&r2=1396760&view=diff ============================================================================== --- accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh (original) +++ accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh Wed Oct 10 19:43:37 2012 @@ -36,7 +36,7 @@ if [ -f ${ACCUMULO_HOME}/conf/accumulo.p 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 -Xss160k" +test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY} -Xmx384m -Xms384m " 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" Modified: accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh?rev=1396760&r1=1396759&r2=1396760&view=diff ============================================================================== --- accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh (original) +++ accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh Wed Oct 10 19:43:37 2012 @@ -36,7 +36,7 @@ if [ -f ${ACCUMULO_HOME}/conf/accumulo.p then POLICY="-Djava.security.manager -Djava.security.policy=${ACCUMULO_HOME}/conf/accumulo.policy" fi -test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY} -Xmx256m -Xms256m -Xss160k" +test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY} -Xmx256m -Xms256m " 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" Modified: accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh?rev=1396760&r1=1396759&r2=1396760&view=diff ============================================================================== --- accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh (original) +++ accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh Wed Oct 10 19:43:37 2012 @@ -36,7 +36,7 @@ if [ -f ${ACCUMULO_HOME}/conf/accumulo.p 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 -Xss160k" +test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY} -Xmx768m -Xms768m " 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" Modified: accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh?rev=1396760&r1=1396759&r2=1396760&view=diff ============================================================================== --- accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh (original) +++ accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh Wed Oct 10 19:43:37 2012 @@ -36,7 +36,7 @@ if [ -f ${ACCUMULO_HOME}/conf/accumulo.p then POLICY="-Djava.security.manager -Djava.security.policy=${ACCUMULO_HOME}/conf/accumulo.policy" fi -test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY} -Xmx1g -Xms1g -Xss160k" +test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY} -Xmx1g -Xms1g -XX:NewSize=500m -XX:MaxNewSize=500m " 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" Modified: accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh?rev=1396760&r1=1396759&r2=1396760&view=diff ============================================================================== --- accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh (original) +++ accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh Wed Oct 10 19:43:37 2012 @@ -36,7 +36,7 @@ if [ -f ${ACCUMULO_HOME}/conf/accumulo.p then POLICY="-Djava.security.manager -Djava.security.policy=${ACCUMULO_HOME}/conf/accumulo.policy" fi -test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY} -Xmx2g -Xms2g -Xss160k" +test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY} -Xmx2g -Xms2g -XX:NewSize=1G -XX:MaxNewSize=1G " 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" Modified: accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh?rev=1396760&r1=1396759&r2=1396760&view=diff ============================================================================== --- accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh (original) +++ accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh Wed Oct 10 19:43:37 2012 @@ -36,7 +36,7 @@ if [ -f ${ACCUMULO_HOME}/conf/accumulo.p then POLICY="-Djava.security.manager -Djava.security.policy=${ACCUMULO_HOME}/conf/accumulo.policy" fi -test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY} -Xmx48m -Xms48m -Xss160k" +test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY} -Xmx48m -Xms48m " 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" Modified: accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh?rev=1396760&r1=1396759&r2=1396760&view=diff ============================================================================== --- accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh (original) +++ accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh Wed Oct 10 19:43:37 2012 @@ -36,7 +36,7 @@ if [ -f ${ACCUMULO_HOME}/conf/accumulo.p 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 -Xss160k" +test -z "$ACCUMULO_TSERVER_OPTS" && export ACCUMULO_TSERVER_OPTS="${POLICY} -Xmx128m -Xms128m " 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" Propchange: accumulo/trunk/core/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/core:r1396758 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1396758 Propchange: accumulo/trunk/server/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/server:r1396758 Propchange: accumulo/trunk/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src:r1396758