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

HADOOP-9524. Fix ShellCommandFencer to work on Windows. Contributed by Arpit Agarwal. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476856 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-04-28 23:16:47 +00:00
parent ae393ab26e
commit 293fb1ec1e
3 changed files with 29 additions and 8 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

@ -529,6 +529,9 @@ Trunk (Unreleased)
HADOOP-9490. LocalFileSystem#reportChecksumFailure not closing the HADOOP-9490. LocalFileSystem#reportChecksumFailure not closing the
checksum file handle before rename. (Ivan Mitic via suresh) checksum file handle before rename. (Ivan Mitic via suresh)
HADOOP-9524. Fix ShellCommandFencer to work on Windows.
(Arpit Agarwal via suresh)
Release 2.0.5-beta - UNRELEASED Release 2.0.5-beta - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

15
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ShellCommandFencer.java
View File

@ -26,6 +26,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configured; import org.apache.hadoop.conf.Configured;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.util.Shell;
/** /**
* Fencing method that runs a shell command. It should be specified * Fencing method that runs a shell command. It should be specified
@ -33,8 +34,8 @@ import com.google.common.annotations.VisibleForTesting;
* <code> * <code>
* shell(/path/to/my/script.sh arg1 arg2 ...) * shell(/path/to/my/script.sh arg1 arg2 ...)
* </code><br> * </code><br>
* The string between '(' and ')' is passed directly to a bash shell and * The string between '(' and ')' is passed directly to a bash shell
* may not include any closing parentheses.<p> * (cmd.exe on Windows) and may not include any closing parentheses.<p>
* *
* The shell command will be run with an environment set up to contain * The shell command will be run with an environment set up to contain
* all of the current Hadoop configuration variables, with the '_' character * all of the current Hadoop configuration variables, with the '_' character
@ -74,8 +75,14 @@ public class ShellCommandFencer
@Override @Override
public boolean tryFence(HAServiceTarget target, String cmd) { public boolean tryFence(HAServiceTarget target, String cmd) {
ProcessBuilder builder = new ProcessBuilder( ProcessBuilder builder;
"bash", "-e", "-c", cmd);
if (!Shell.WINDOWS) {
builder = new ProcessBuilder("bash", "-e", "-c", cmd);
} else {
builder = new ProcessBuilder("cmd.exe", "/c", cmd);
}
setConfAsEnvVars(builder.environment()); setConfAsEnvVars(builder.environment());
addTargetInfoAsEnvVars(target, builder.environment()); addTargetInfoAsEnvVars(target, builder.environment());

13
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestNodeFencer.java
View File

@ -24,6 +24,7 @@ import java.util.List;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured; import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.util.Shell;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
@ -34,6 +35,11 @@ public class TestNodeFencer {
private HAServiceTarget MOCK_TARGET; private HAServiceTarget MOCK_TARGET;
// Fencer shell commands that always return true on Unix and Windows
// respectively. Lacking the POSIX 'true' command on Windows, we use
// the batch command 'rem'.
private static String FENCER_TRUE_COMMAND_UNIX = "shell(true)";
private static String FENCER_TRUE_COMMAND_WINDOWS = "shell(rem)";
@Before @Before
public void clearMockState() { public void clearMockState() {
@ -48,6 +54,11 @@ public class TestNodeFencer {
.when(MOCK_TARGET).getAddress(); .when(MOCK_TARGET).getAddress();
} }
private static String getFencerTrueCommand() {
return Shell.WINDOWS ?
FENCER_TRUE_COMMAND_WINDOWS : FENCER_TRUE_COMMAND_UNIX;
}
@Test @Test
public void testSingleFencer() throws BadFencingConfigurationException { public void testSingleFencer() throws BadFencingConfigurationException {
NodeFencer fencer = setupFencer( NodeFencer fencer = setupFencer(
@ -100,7 +111,7 @@ public class TestNodeFencer {
@Test @Test
public void testShortNameShell() throws BadFencingConfigurationException { public void testShortNameShell() throws BadFencingConfigurationException {
NodeFencer fencer = setupFencer("shell(true)"); NodeFencer fencer = setupFencer(getFencerTrueCommand());
assertTrue(fencer.fence(MOCK_TARGET)); assertTrue(fencer.fence(MOCK_TARGET));
} }