You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/04/07 14:34:32 UTC
[1/2] incubator-ignite git commit: # IGNITE-665: Applied patch from
Ivan V..
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-3 943a49b26 -> 21e328db3
# 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-sprint-3
Commit: 2a6462183c37d09321df61a0f6ed56789c562f14
Parents: bed567f
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Apr 7 15:34:03 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
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 @@
</bean>
</property>
- <!-- Example secondary file system configuration (IGFS configured over Hadoop HDFS): -->
+ <!-- Sample secondary file system configuration.
+ 'uri' - the URI of the secondary file system.
+ 'cfgPath' - optional configuration path of the secondary file system,
+ e.g. /opt/foo/core-site.xml. Typically left to be null.
+ 'userName' - optional user name to access the secondary file system on behalf of. Use it
+ if Hadoop client and the Ignite node are running on behalf of different users.
+ -->
<!--
- <property name="defaultMode" value="PROXY"/>
-
<property name="secondaryFileSystem">
<bean class="org.apache.ignite.hadoop.fs.IgniteHadoopIgfsSecondaryFileSystem">
- <constructor-arg name="uri" value="hdfs://1.2.3.4:9000"/>
- <constructor-arg name="cfgPath" value="/opt/hadoop-server/etc/hadoop/core-site.xml"/>
+ <constructor-arg name="uri" value="hdfs://localhost:9000"/>
+ <constructor-arg name="cfgPath"><null/></constructor-arg>
+ <constructor-arg name="userName" value="client-user-name"/>
</bean>
</property>
-->
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/21e328db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/21e328db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/21e328db
Branch: refs/heads/ignite-sprint-3
Commit: 21e328db304529da686b6d22d1f540d5e0a521b2
Parents: 2a64621 943a49b
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Apr 7 15:34:28 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Apr 7 15:34:28 2015 +0300
----------------------------------------------------------------------
.../ignite/examples/streaming/StreamTransformerExample.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------