You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ki...@apache.org on 2016/03/04 20:01:52 UTC
[1/3] storm git commit: Fixed missed heap settings
Repository: storm
Updated Branches:
refs/heads/1.x-branch 00d12e26d -> e5c23a936
Fixed missed heap settings
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/39c34aeb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/39c34aeb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/39c34aeb
Branch: refs/heads/1.x-branch
Commit: 39c34aeb0cf95b0fca50997cd4182c629971b8e6
Parents: ce6b468
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Feb 10 15:59:38 2016 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Fri Mar 4 18:58:59 2016 +0000
----------------------------------------------------------------------
dev-tools/travis/travis-script.sh | 2 +-
storm-core/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/39c34aeb/dev-tools/travis/travis-script.sh
----------------------------------------------------------------------
diff --git a/dev-tools/travis/travis-script.sh b/dev-tools/travis/travis-script.sh
index 4984a57..c6625cb 100755
--- a/dev-tools/travis/travis-script.sh
+++ b/dev-tools/travis/travis-script.sh
@@ -25,7 +25,7 @@ cd ${STORM_SRC_ROOT_DIR}
# We should be concerned that Travis CI could be very slow because it uses VM
export STORM_TEST_TIMEOUT_MS=150000
# Travis only has 3GB of memory, lets use 1GB for build, and 1.5GB for forked JVMs
-#export MAVEN_OPTS="-Xmx1024m"
+export MAVEN_OPTS="-Xmx1024m"
mvn --batch-mode test -fae -Pnative,all-tests -Prat -pl "$2"
BUILD_RET_VAL=$?
http://git-wip-us.apache.org/repos/asf/storm/blob/39c34aeb/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 37da95d..5386d85 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -438,7 +438,7 @@
<junitOutput>true</junitOutput>
<testScript>test/resources/test_runner.clj</testScript>
<!-- argLine is set by JaCoCo for code coverage -->
- <vmargs>${argLine} ${test.extra.args}</vmargs>
+ <vmargs>-Xmx1536m ${argLine} ${test.extra.args}</vmargs>
<!-- Run clojure unit tests or all tests (including integration tests) depending on the profile enabled -->
<testNamespaces>
<testNamespace>${clojure.test.set}</testNamespace>
[2/3] storm git commit: STORM-1436: Set Travis Heap size to fit in
memory limits.
Posted by ki...@apache.org.
STORM-1436: Set Travis Heap size to fit in memory limits.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ce6b4681
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ce6b4681
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ce6b4681
Branch: refs/heads/1.x-branch
Commit: ce6b4681365187e4844a91260bc23221f29837b5
Parents: 00d12e2
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Feb 9 16:30:34 2016 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Fri Mar 4 18:58:59 2016 +0000
----------------------------------------------------------------------
dev-tools/travis/travis-script.sh | 4 +++-
external/storm-mqtt/core/pom.xml | 4 ++--
pom.xml | 2 ++
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ce6b4681/dev-tools/travis/travis-script.sh
----------------------------------------------------------------------
diff --git a/dev-tools/travis/travis-script.sh b/dev-tools/travis/travis-script.sh
index 7f00cb4..4984a57 100755
--- a/dev-tools/travis/travis-script.sh
+++ b/dev-tools/travis/travis-script.sh
@@ -24,8 +24,10 @@ cd ${STORM_SRC_ROOT_DIR}
# We should be concerned that Travis CI could be very slow because it uses VM
export STORM_TEST_TIMEOUT_MS=150000
+# Travis only has 3GB of memory, lets use 1GB for build, and 1.5GB for forked JVMs
+#export MAVEN_OPTS="-Xmx1024m"
-mvn --batch-mode test -fae -Pnative,all-tests -Prat -pl $2
+mvn --batch-mode test -fae -Pnative,all-tests -Prat -pl "$2"
BUILD_RET_VAL=$?
for dir in `find . -type d -and -wholename \*/target/\*-reports`;
http://git-wip-us.apache.org/repos/asf/storm/blob/ce6b4681/external/storm-mqtt/core/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-mqtt/core/pom.xml b/external/storm-mqtt/core/pom.xml
index ee16dae..cd30012 100644
--- a/external/storm-mqtt/core/pom.xml
+++ b/external/storm-mqtt/core/pom.xml
@@ -94,7 +94,7 @@
<includes>
<include>${java.unit.test.include}</include>
</includes>
- <argLine>-Djava.net.preferIPv4Stack=true</argLine>
+ <argLine>-Djava.net.preferIPv4Stack=true -Xmx1536m</argLine>
</configuration>
</plugin>
<plugin>
@@ -109,7 +109,7 @@
<include>${java.integration.test.include}</include>
</includes>
<groups>${java.integration.test.group}</groups> <!--set in integration-test the profile-->
- <argLine>-Djava.net.preferIPv4Stack=true</argLine>
+ <argLine>-Djava.net.preferIPv4Stack=true -Xmx1536m</argLine>
</configuration>
<executions>
<execution>
http://git-wip-us.apache.org/repos/asf/storm/blob/ce6b4681/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0f690ff..f507265 100644
--- a/pom.xml
+++ b/pom.xml
@@ -876,6 +876,7 @@
<includes>
<include>${java.unit.test.include}</include>
</includes>
+ <argLine>-Xmx1536m</argLine>
</configuration>
</plugin>
<plugin>
@@ -887,6 +888,7 @@
<include>${java.integration.test.include}</include>
</includes>
<groups>${java.integration.test.group}</groups> <!--set in integration-test the profile-->
+ <argLine>-Xmx1536m</argLine>
</configuration>
<executions>
<execution>
[3/3] storm git commit: Fixing Travis Build failures by configuring
heap size
Posted by ki...@apache.org.
Fixing Travis Build failures by configuring heap size
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e5c23a93
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e5c23a93
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e5c23a93
Branch: refs/heads/1.x-branch
Commit: e5c23a936b5be3b6c68b51577e5e17760167b350
Parents: 39c34ae
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Fri Mar 4 19:01:32 2016 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Fri Mar 4 19:01:32 2016 +0000
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e5c23a93/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6fbefb..0f353d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.0
+ * STORM-1436: Set Travis Heap size to fit in memory limits in travis builds.
* STORM-1529: Change default worker temp directory location for workers
* STORM-1543: DRPCSpout should always try to reconnect disconnected DRPCInvocationsClient
* STORM-1561: Supervisor should relaunch worker if assignments have changed