big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-12467. Respect user-defined JAVA_LIBRARY_PATH in Windows Hadoop scripts. Contributed by Radhey Shah.

Browse Source
This commit is contained in:
Haohui Mai 2015-11-22 16:03:59 -08:00
parent 66428d33a7
commit f0cd903866
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -1434,6 +1434,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-11218. Add TLSv1.1,TLSv1.2 to KMS, HttpFS, SSLFactory. HADOOP-11218. Add TLSv1.1,TLSv1.2 to KMS, HttpFS, SSLFactory.
(Vijay Singh via wheat9) (Vijay Singh via wheat9)
HADOOP-12467. Respect user-defined JAVA_LIBRARY_PATH in Windows Hadoop
scripts. (Radhey Shah via wheat9)
Release 2.7.3 - UNRELEASED Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

9
hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd
View File

@ -198,14 +198,21 @@ set JAVA_PLATFORM=%JAVA_PLATFORM: =_%
@rem @rem
@rem Check if we're running hadoop directly from the build @rem Check if we're running hadoop directly from the build
set JAVA_LIBRARY_PATH=
if exist %HADOOP_COMMON_HOME%\target\bin ( if exist %HADOOP_COMMON_HOME%\target\bin (
if defined JAVA_LIBRARY_PATH (
set JAVA_LIBRARY_PATH=%JAVA_LIBRARY_PATH%;%HADOOP_COMMON_HOME%\target\bin
) else (
set JAVA_LIBRARY_PATH=%HADOOP_COMMON_HOME%\target\bin set JAVA_LIBRARY_PATH=%HADOOP_COMMON_HOME%\target\bin
) )
)
@rem For the distro case, check the bin folder @rem For the distro case, check the bin folder
if exist %HADOOP_COMMON_HOME%\bin ( if exist %HADOOP_COMMON_HOME%\bin (
if defined JAVA_LIBRARY_PATH (
set JAVA_LIBRARY_PATH=%JAVA_LIBRARY_PATH%;%HADOOP_COMMON_HOME%\bin set JAVA_LIBRARY_PATH=%JAVA_LIBRARY_PATH%;%HADOOP_COMMON_HOME%\bin
) else (
set JAVA_LIBRARY_PATH=%HADOOP_COMMON_HOME%\bin
)
) )
@rem @rem