HADOOP-10746: Merging r1605140 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605141 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
1307f2aeae
commit
e921428d1a
|
@ -248,6 +248,9 @@ Release 2.5.0 - UNRELEASED
|
|||
HADOOP-9559. When metrics system is restarted MBean names get incorrectly
|
||||
flagged as dupes. (Mostafa Elhemali and Mike Liddell via cnauroth)
|
||||
|
||||
HADOOP-10746. TestSocketIOWithTimeout#testSocketIOWithTimeout fails on
|
||||
Power PC. (Jinghui Wang via Arpit Agarwal)
|
||||
|
||||
BREAKDOWN OF HADOOP-10514 SUBTASKS AND RELATED JIRAS
|
||||
|
||||
HADOOP-10520. Extended attributes definition and FileSystem APIs for
|
||||
|
|
|
@ -126,6 +126,9 @@ abstract public class Shell {
|
|||
public static final boolean LINUX = (osType == OSType.OS_TYPE_LINUX);
|
||||
public static final boolean OTHER = (osType == OSType.OS_TYPE_OTHER);
|
||||
|
||||
public static final boolean PPC_64
|
||||
= System.getProperties().getProperty("os.arch").contains("ppc64");
|
||||
|
||||
/** a Unix command to get the current user's groups list */
|
||||
public static String[] getGroupsCommand() {
|
||||
return (WINDOWS)? new String[]{"cmd", "/c", "groups"}
|
||||
|
|
|
@ -151,7 +151,7 @@ public class TestSocketIOWithTimeout {
|
|||
// simulate a partial write scenario. Attempts were made to switch the
|
||||
// test from using a pipe to a network socket and also to use larger and
|
||||
// larger buffers in doIO. Nothing helped the situation though.
|
||||
if (!Shell.WINDOWS) {
|
||||
if (!Shell.WINDOWS && !Shell.PPC_64) {
|
||||
try {
|
||||
out.write(1);
|
||||
fail("Did not throw");
|
||||
|
|
Loading…
Reference in New Issue