You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2014/12/22 12:59:25 UTC
[13/31] incubator-nifi git commit: NIFI-186: Added additional args to
bootstrap conf file
NIFI-186: Added additional args to bootstrap conf file
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b0a51150
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b0a51150
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b0a51150
Branch: refs/heads/NIFI-182
Commit: b0a5115097eb1fb30a390c0dc5da64edb60ed2dc
Parents: f048ed7
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Dec 19 14:25:26 2014 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Dec 19 14:25:26 2014 -0500
----------------------------------------------------------------------
.../src/main/resources/conf/bootstrap.conf | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b0a51150/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf b/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
index 37ec474..6208560 100644
--- a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
+++ b/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
@@ -1,3 +1,9 @@
+# Java command to use when running NiFi
+java=java
+
+# Username to use when running NiFi. This value will be ignored on Windows.
+run.as=
+
# Configure where NiFi's lib and conf directories live
lib.dir=./lib
conf.dir=./conf
@@ -15,8 +21,14 @@ java.arg.3=-Xmx512m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-# Java command to use when running NiFi
-java=java
+java.arg.4=-Djava.net.preferIPv4Stack=true
-# Username to use when running NiFi. This value will be ignored on Windows.
-run.as=
+# allowRestrictedHeaders is required for Cluster/Node communications to work properly
+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