You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2013/06/16 05:33:24 UTC
svn commit: r1493453 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
CHANGES.txt src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java
Author: cnauroth
Date: Sun Jun 16 03:33:23 2013
New Revision: 1493453
URL: http://svn.apache.org/r1493453
Log:
HADOOP-9632. Merging change r1493451 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1493453&r1=1493452&r2=1493453&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Sun Jun 16 03:33:23 2013
@@ -263,6 +263,9 @@ Release 2.1.0-beta - UNRELEASED
HADOOP-9532. HADOOP_CLIENT_OPTS is appended twice by Windows cmd scripts.
(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
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java?rev=1493453&r1=1493452&r2=1493453&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java Sun Jun 16 03:33:23 2013
@@ -36,7 +36,7 @@ public class TestShellCommandFencer {
private ShellCommandFencer fencer = createFencer();
private static final HAServiceTarget TEST_TARGET =
new DummyHAService(HAServiceState.ACTIVE,
- new InetSocketAddress("host", 1234));
+ new InetSocketAddress("dummyhost", 1234));
@BeforeClass
public static void setupLogSpy() {
@@ -140,13 +140,13 @@ public class TestShellCommandFencer {
@Test
public void testTargetAsEnvironment() {
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.endsWith("echo $ta...t_address: host 1234 host:1234"));
+ Mockito.endsWith("echo $ta...rget_port: dummyhost 1234"));
} 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.endsWith("echo %ta..._address%: host 1234 host:1234"));
+ Mockito.endsWith("echo %ta...get_port%: dummyhost 1234"));
}
}