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

HADOOP-9632. Merging change r1493451 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493453 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2013-06-16 03:33:23 +00:00
parent cf179b9b0a
commit 7742b1b92e
2 changed files with 8 additions and 5 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

@ -263,6 +263,9 @@ Release 2.1.0-beta - UNRELEASED
HADOOP-9532. HADOOP_CLIENT_OPTS is appended twice by Windows cmd scripts. HADOOP-9532. HADOOP_CLIENT_OPTS is appended twice by Windows cmd scripts.
(Chris Nauroth via suresh) (Chris Nauroth via suresh)
HADOOP-9632. TestShellCommandFencer will fail if there is a 'host' machine in
the network. (Chuan Liu via cnauroth)
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
HADOOP-8924. Hadoop Common creating package-info.java must not depend on HADOOP-8924. Hadoop Common creating package-info.java must not depend on

10
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java
View File

@ -36,7 +36,7 @@ public class TestShellCommandFencer {
private ShellCommandFencer fencer = createFencer(); private ShellCommandFencer fencer = createFencer();
private static final HAServiceTarget TEST_TARGET = private static final HAServiceTarget TEST_TARGET =
new DummyHAService(HAServiceState.ACTIVE, new DummyHAService(HAServiceState.ACTIVE,
new InetSocketAddress("host", 1234)); new InetSocketAddress("dummyhost", 1234));
@BeforeClass @BeforeClass
public static void setupLogSpy() { public static void setupLogSpy() {
@ -140,13 +140,13 @@ public class TestShellCommandFencer {
@Test @Test
public void testTargetAsEnvironment() { public void testTargetAsEnvironment() {
if (!Shell.WINDOWS) { if (!Shell.WINDOWS) {
fencer.tryFence(TEST_TARGET, "echo $target_host $target_port $target_address"); fencer.tryFence(TEST_TARGET, "echo $target_host $target_port");
Mockito.verify(ShellCommandFencer.LOG).info( Mockito.verify(ShellCommandFencer.LOG).info(
Mockito.endsWith("echo $ta...t_address: host 1234 host:1234")); Mockito.endsWith("echo $ta...rget_port: dummyhost 1234"));
} else { } else {
fencer.tryFence(TEST_TARGET, "echo %target_host% %target_port% %target_address%"); fencer.tryFence(TEST_TARGET, "echo %target_host% %target_port%");
Mockito.verify(ShellCommandFencer.LOG).info( Mockito.verify(ShellCommandFencer.LOG).info(
Mockito.endsWith("echo %ta..._address%: host 1234 host:1234")); Mockito.endsWith("echo %ta...get_port%: dummyhost 1234"));
} }
} }