Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3D93A175A6 for ; Wed, 8 Apr 2015 10:11:26 +0000 (UTC) Received: (qmail 86832 invoked by uid 500); 8 Apr 2015 10:11:26 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 86803 invoked by uid 500); 8 Apr 2015 10:11:26 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 86794 invoked by uid 99); 8 Apr 2015 10:11:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Apr 2015 10:11:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 08 Apr 2015 10:10:55 +0000 Received: (qmail 83860 invoked by uid 99); 8 Apr 2015 10:10:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Apr 2015 10:10:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5D51CE2F40; Wed, 8 Apr 2015 10:10:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 08 Apr 2015 10:11:23 -0000 Message-Id: <883c526e56e24d8898ff56a0fa9104db@git.apache.org> In-Reply-To: <07d5503e3e61480fb5eeb69941ce108f@git.apache.org> References: <07d5503e3e61480fb5eeb69941ce108f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [32/51] [abbrv] incubator-ignite git commit: # IGNITE-665: Applied patch from Ivan V.. X-Virus-Checked: Checked by ClamAV on apache.org # IGNITE-665: Applied patch from Ivan V.. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a646218 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a646218 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a646218 Branch: refs/heads/ignite-683-1 Commit: 2a6462183c37d09321df61a0f6ed56789c562f14 Parents: bed567f Author: vozerov-gridgain Authored: Tue Apr 7 15:34:03 2015 +0300 Committer: vozerov-gridgain Committed: Tue Apr 7 15:34:03 2015 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/include/service.sh | 8 +++++--- config/hadoop/default-config.xml | 15 ++++++++++----- 4 files changed, 17 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a646218/bin/ignite.bat ---------------------------------------------------------------------- diff --git a/bin/ignite.bat b/bin/ignite.bat index f390422..687db60 100644 --- a/bin/ignite.bat +++ b/bin/ignite.bat @@ -195,7 +195,7 @@ if "%MAIN_CLASS%" == "" set MAIN_CLASS=org.apache.ignite.startup.cmdline.Command :: :: Remote debugging (JPDA). :: Uncomment and change if remote debugging is required. -:: set JVM_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n %JVM_OPTS% +:: set JVM_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8787 %JVM_OPTS% :: if "%INTERACTIVE%" == "1" ( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a646218/bin/ignite.sh ---------------------------------------------------------------------- diff --git a/bin/ignite.sh b/bin/ignite.sh index e77db17..a246613 100755 --- a/bin/ignite.sh +++ b/bin/ignite.sh @@ -130,7 +130,7 @@ fi # Remote debugging (JPDA). # Uncomment and change if remote debugging is required. # -# JVM_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n ${JVM_OPTS}" +# JVM_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8787 ${JVM_OPTS}" ERRORCODE="-1" http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a646218/bin/include/service.sh ---------------------------------------------------------------------- diff --git a/bin/include/service.sh b/bin/include/service.sh index 7400ec7..73beb86 100755 --- a/bin/include/service.sh +++ b/bin/include/service.sh @@ -53,8 +53,7 @@ case "$1" in # Set default JVM options if they was not passed. if [ -z "$JVM_OPTS" ]; then - JVM_OPTS="-Xms1g -Xmx1g -server -XX:+AggressiveOpts" - [ "$HADOOP_EDITION" = "1" ] && JVM_OPTS="${JVM_OPTS} -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled" + JVM_OPTS="-Xms1g -Xmx1g -server -XX:+AggressiveOpts -XX:MaxPermSize=512m" fi # Resolve config directory. @@ -66,9 +65,12 @@ case "$1" in # Discover path to Java executable and check it's version. checkJava + # Clear output log. + echo >"${IGNITE_LOG_DIR}"/ignite.out + # And run. $JAVA $JVM_OPTS -DIGNITE_UPDATE_NOTIFIER=false -DIGNITE_HOME="${IGNITE_HOME}" \ - -DIGNITE_PROG_NAME="$0" -cp "$IGNITE_LIBS" "$MAIN_CLASS" "$DEFAULT_CONFIG" &>/dev/null & + -DIGNITE_PROG_NAME="$0" -cp "$IGNITE_LIBS" "$MAIN_CLASS" "$DEFAULT_CONFIG" >& "${IGNITE_LOG_DIR}"/ignite.out & # Write process id. echo $! >$PIDFILE http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a646218/config/hadoop/default-config.xml ---------------------------------------------------------------------- diff --git a/config/hadoop/default-config.xml b/config/hadoop/default-config.xml index e45311e..30413b0 100644 --- a/config/hadoop/default-config.xml +++ b/config/hadoop/default-config.xml @@ -130,14 +130,19 @@ - +