Repository: nifi Updated Branches: refs/heads/master 5419891fe -> 776a00b0b
NIFI-2860 Use different properties for JVM Heap Max and Min values This closes: #1382 Signed-off-by: Andre F de Miranda <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/776a00b0 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/776a00b0 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/776a00b0 Branch: refs/heads/master Commit: 776a00b0be4cc9160e0596b714ff7613cc248e14 Parents: 5419891 Author: Pierre Villard <[email protected]> Authored: Tue Jan 3 15:35:00 2017 +0100 Committer: Andre F de Miranda <[email protected]> Committed: Tue Apr 11 21:18:49 2017 +1000 ---------------------------------------------------------------------- .../nifi-framework/nifi-resources/pom.xml | 4 ++-- .../nifi-resources/src/main/resources/conf/bootstrap.conf | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/776a00b0/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml index b8d3ad9..d6b1aaf 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml @@ -25,8 +25,8 @@ <description>holds common resources used to build installers</description> <properties> <!--Wrapper Properties --> - <nifi.jvm.heap.mb>512</nifi.jvm.heap.mb> - <nifi.jvm.permgen.mb>128</nifi.jvm.permgen.mb> + <nifi.jvm.heap.init>512m</nifi.jvm.heap.init> + <nifi.jvm.heap.max>512m</nifi.jvm.heap.max> <nifi.run.as /> <!-- nifi.properties: core properties --> <nifi.flowcontroller.autoResumeState>true</nifi.flowcontroller.autoResumeState> http://git-wip-us.apache.org/repos/asf/nifi/blob/776a00b0/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf index 09126b2..e936780 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf @@ -32,8 +32,8 @@ graceful.shutdown.seconds=20 java.arg.1=-Dorg.apache.jasper.compiler.disablejsr199=true # JVM memory settings -java.arg.2=-Xms${nifi.jvm.heap.mb}m -java.arg.3=-Xmx${nifi.jvm.heap.mb}m +java.arg.2=-Xms${nifi.jvm.heap.init} +java.arg.3=-Xmx${nifi.jvm.heap.max} # Enable Remote Debugging #java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000 @@ -74,4 +74,4 @@ notification.max.attempts=5 #nifi.stop.notification.services=email-notification # Comma-separated list of identifiers that are present in the notification.services.file; which services should be used to notify when NiFi dies? -#nifi.dead.notification.services=email-notification \ No newline at end of file +#nifi.dead.notification.services=email-notification
