You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by br...@apache.org on 2016/11/29 11:59:21 UTC
nifi-minifi git commit: MINIFI-126 Adjusting default JVM size and
removing bootstrap properties relating to Java 7
Repository: nifi-minifi
Updated Branches:
refs/heads/master aeea72b71 -> d681f8fd6
MINIFI-126 Adjusting default JVM size and removing bootstrap properties relating to Java 7
This closes #58
Signed-off-by: Bryan Rosander <br...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/d681f8fd
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/d681f8fd
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/d681f8fd
Branch: refs/heads/master
Commit: d681f8fd6737c3660722de4c7e53849f32c2d36c
Parents: aeea72b
Author: Joseph Percivall <JP...@apache.org>
Authored: Mon Nov 28 16:41:28 2016 -0500
Committer: Bryan Rosander <br...@apache.org>
Committed: Tue Nov 29 06:57:49 2016 -0500
----------------------------------------------------------------------
minifi-assembly/pom.xml | 2 +-
.../minifi-resources/src/main/resources/conf/bootstrap.conf | 8 --------
2 files changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/d681f8fd/minifi-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/minifi-assembly/pom.xml b/minifi-assembly/pom.xml
index 6827110..b303c6c 100644
--- a/minifi-assembly/pom.xml
+++ b/minifi-assembly/pom.xml
@@ -271,7 +271,7 @@ limitations under the License.
<properties>
<!--Bootstrap Properties -->
- <minifi.jvm.heap.mb>512</minifi.jvm.heap.mb>
+ <minifi.jvm.heap.mb>256</minifi.jvm.heap.mb>
<minifi.jvm.permgen.mb>128</minifi.jvm.permgen.mb>
<minifi.run.as />
</properties>
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/d681f8fd/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/bootstrap.conf
----------------------------------------------------------------------
diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/bootstrap.conf b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/bootstrap.conf
index 2f43f5c..2525d43 100644
--- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/bootstrap.conf
+++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/bootstrap.conf
@@ -85,14 +85,6 @@ java.arg.4=-Djava.net.preferIPv4Stack=true
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
-# Java 7 and below have issues with Code Cache. The following lines allow us to run well even with
-# many classes loaded in the JVM.
-#java.arg.7=-XX:ReservedCodeCacheSize=256m
-#java.arg.8=-XX:CodeCacheFlushingMinimumFreeSpace=10m
-#java.arg.9=-XX:+UseCodeCacheFlushing
-#java.arg.11=-XX:PermSize=${minifi.jvm.permgen.mb}M
-#java.arg.12=-XX:MaxPermSize=${minifi.jvm.permgen.mb}M
-
# The G1GC is still considered experimental but has proven to be very advantageous in providing great
# performance without significant "stop-the-world" delays.
#java.arg.13=-XX:+UseG1GC