Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-7680 TestHardLink fails on Mac OS X, when gnu stat is in path. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1290869 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steve Loughran 2012-02-18 21:05:31 +00:00
parent 5238f8fe98
commit 1705035963
2 changed files with 4 additions and 1 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

@ -57,6 +57,9 @@ Release 0.23.2 - UNRELEASED
HADOOP-8057 hadoop-setup-conf.sh not working because of some extra spaces. HADOOP-8057 hadoop-setup-conf.sh not working because of some extra spaces.
(Vinayakumar B via stevel) (Vinayakumar B via stevel)
HADOOP-7680 TestHardLink fails on Mac OS X, when gnu stat is in path.
(Milind Bhandarkar via stevel)
Release 0.23.1 - 2012-02-17 Release 0.23.1 - 2012-02-17
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java
View File

@ -64,7 +64,7 @@ public class HardLink {
//override getLinkCountCommand for the particular Unix variant //override getLinkCountCommand for the particular Unix variant
//Linux is already set as the default - {"stat","-c%h", null} //Linux is already set as the default - {"stat","-c%h", null}
if (osType == OSType.OS_TYPE_MAC) { if (osType == OSType.OS_TYPE_MAC) {
String[] linkCountCmdTemplate = {"stat","-f%l", null}; String[] linkCountCmdTemplate = {"/usr/bin/stat","-f%l", null};
HardLinkCGUnix.setLinkCountCmdTemplate(linkCountCmdTemplate); HardLinkCGUnix.setLinkCountCmdTemplate(linkCountCmdTemplate);
} else if (osType == OSType.OS_TYPE_SOLARIS) { } else if (osType == OSType.OS_TYPE_SOLARIS) {
String[] linkCountCmdTemplate = {"ls","-l", null}; String[] linkCountCmdTemplate = {"ls","-l", null};