Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-4363 Replaced hardcoded heap size options with JAVA_ARGS environment variable. 

This closes #2136.

Signed-off-by: Koji Kawamura <ijokarumawak@apache.org>
This commit is contained in:
Jeff Storck 2017-09-08 17:33:00 -04:00 committed by Koji Kawamura
parent 6c798d18ef
commit d27103100d
16 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.bat
View File

@ -33,7 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms128m -Xmx256m org.apache.nifi.properties.ConfigEncryptionTool
if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms128m -Xmx256m
SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.properties.ConfigEncryptionTool
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""

2
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.sh
View File

@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
"${JAVA}" -cp "${CLASSPATH}" -Xms128m -Xmx256m org.apache.nifi.properties.ConfigEncryptionTool "$@"
"${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms128m -Xmx256m} org.apache.nifi.properties.ConfigEncryptionTool "$@"
return $?
}

4
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.bat
View File

@ -33,7 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.toolkit.admin.filemanager.FileManagerTool
if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.admin.filemanager.FileManagerTool
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""

2
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/file-manager.sh
View File

@ -110,7 +110,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
"${JAVA}" -cp "${CLASSPATH}" -Xms12m -Xmx24m org.apache.nifi.toolkit.admin.filemanager.FileManagerTool "$@"
"${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.admin.filemanager.FileManagerTool "$@"
return $?
}

4
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.bat
View File

@ -33,7 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.toolkit.flowanalyzer.FlowAnalyzerDriver
if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.flowanalyzer.FlowAnalyzerDriver
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""

2
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/flow-analyzer.sh
View File

@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
"${JAVA}" -cp "${CLASSPATH}" -Xms12m -Xmx24m org.apache.nifi.toolkit.flowanalyzer.FlowAnalyzerDriver "$@"
"${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.flowanalyzer.FlowAnalyzerDriver "$@"
return $?
}

4
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.bat
View File

@ -33,7 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~sdp0..\classpath;%~sdp0..\lib
SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.toolkit.admin.nodemanager.NodeManagerTool
Sif "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
ET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.admin.nodemanager.NodeManagerTool
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""

2
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/node-manager.sh
View File

@ -110,7 +110,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
"${JAVA}" -cp "${CLASSPATH}" -Xms12m -Xmx24m org.apache.nifi.toolkit.admin.nodemanager.NodeManagerTool "$@"
"${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.admin.nodemanager.NodeManagerTool "$@"
return $?
}

4
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.bat
View File

@ -33,7 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~sdp0..\classpath;%~sdp0..\lib
SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.toolkit.admin.notify.NotificationTool
if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.admin.notify.NotificationTool
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""

2
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/notify.sh
View File

@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
"${JAVA}" -cp "${CLASSPATH}" -Xms12m -Xmx24m org.apache.nifi.toolkit.admin.notify.NotificationTool "$@"
"${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.admin.notify.NotificationTool "$@"
return $?
}

4
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat
View File

@ -33,7 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms128m -Xmx256m %JAVA_ARGS% org.apache.nifi.toolkit.s2s.SiteToSiteCliMain
if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms128m -Xmx256m
SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.s2s.SiteToSiteCliMain
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""

2
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh
View File

@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
"${JAVA}" -cp "${CLASSPATH}" -Xms128m -Xmx256m org.apache.nifi.toolkit.s2s.SiteToSiteCliMain "$@"
"${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms128m -Xmx256m} org.apache.nifi.toolkit.s2s.SiteToSiteCliMain "$@"
return $?
}

4
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat
View File

@ -33,7 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.toolkit.tls.TlsToolkitMain
if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.tls.TlsToolkitMain
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""

2
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh
View File

@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
"${JAVA}" -cp "${CLASSPATH}" -Xms12m -Xmx24m org.apache.nifi.toolkit.tls.TlsToolkitMain "$@"
"${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.tls.TlsToolkitMain "$@"
return $?
}

4
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat
View File

@ -33,7 +33,9 @@ goto startConfig
:startConfig
set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.toolkit.zkmigrator.ZooKeeperMigratorMain
if "%JAVA_ARGS%" == "" set JAVA_ARGS=-Xms12m -Xmx24m
SET JAVA_PARAMS=-cp %LIB_DIR%\* %JAVA_ARGS% org.apache.nifi.toolkit.zkmigrator.ZooKeeperMigratorMain
cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""

2
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh
View File

@ -111,7 +111,7 @@ run() {
export NIFI_TOOLKIT_HOME="$NIFI_TOOLKIT_HOME"
umask 0077
"${JAVA}" -cp "${CLASSPATH}" -Xms12m -Xmx24m org.apache.nifi.toolkit.zkmigrator.ZooKeeperMigratorMain "$@"
"${JAVA}" -cp "${CLASSPATH}" ${JAVA_ARGS:--Xms12m -Xmx24m} org.apache.nifi.toolkit.zkmigrator.ZooKeeperMigratorMain "$@"
return $?
}