From fcf1039cdc8bb7253935ef7361a0dfc026155f8f Mon Sep 17 00:00:00 2001 From: Eli Collins Date: Sat, 7 Jan 2012 03:29:35 +0000 Subject: [PATCH] Previous commit didn't fixup package statements. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1228561 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.HDFS-1623.txt | 2 ++ .../apache/hadoop/ha/BadFencingConfigurationException.java | 4 ++-- .../src/main/java/org/apache/hadoop/ha/FenceMethod.java | 4 ++-- .../src/main/java/org/apache/hadoop/ha/NodeFencer.java | 2 +- .../main/java/org/apache/hadoop/ha/ShellCommandFencer.java | 2 +- .../src/main/java/org/apache/hadoop/ha/SshFenceByTcpPort.java | 2 +- .../src/main/java/org/apache/hadoop/ha/StreamPumper.java | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.HDFS-1623.txt b/hadoop-common-project/hadoop-common/CHANGES.HDFS-1623.txt index 107572ae49..571fbcd765 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.HDFS-1623.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.HDFS-1623.txt @@ -26,3 +26,5 @@ HADOOP-7932. Make client connection retries on socket time outs configurable. (Uma Maheswara Rao G via todd) HADOOP-7924. 
FailoverController for client-based configuration (eli) + +HADOOP-7961. Move HA fencing to common. (eli) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/BadFencingConfigurationException.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/BadFencingConfigurationException.java index 4540d9994d..3d3b1ba53c 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/BadFencingConfigurationException.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/BadFencingConfigurationException.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hdfs.server.namenode.ha; +package org.apache.hadoop.ha; import java.io.IOException; @@ -33,4 +33,4 @@ public BadFencingConfigurationException(String msg) { public BadFencingConfigurationException(String msg, Throwable cause) { super(msg, cause); } -} \ No newline at end of file +} diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/FenceMethod.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/FenceMethod.java index e4c79a229e..c448241a83 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/FenceMethod.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/FenceMethod.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hdfs.server.namenode.ha; +package org.apache.hadoop.ha; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; @@ -60,4 +60,4 @@ public interface FenceMethod { * determined to be invalid only at runtime */ public boolean tryFence(String args) throws BadFencingConfigurationException; -} \ No newline at end of file +} diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/NodeFencer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/NodeFencer.java index 279a26acd9..61ef950c05 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/NodeFencer.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/NodeFencer.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hdfs.server.namenode.ha; +package org.apache.hadoop.ha; import java.util.List; import java.util.Map; diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ShellCommandFencer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ShellCommandFencer.java index 96e1228746..07d11629a4 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ShellCommandFencer.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ShellCommandFencer.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hdfs.server.namenode.ha; +package org.apache.hadoop.ha; import java.io.IOException; import java.lang.reflect.Field; diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/SshFenceByTcpPort.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/SshFenceByTcpPort.java index ecccb4e1f3..48bb59c294 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/SshFenceByTcpPort.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/SshFenceByTcpPort.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hdfs.server.namenode.ha; +package org.apache.hadoop.ha; import java.io.IOException; import java.net.InetAddress; diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/StreamPumper.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/StreamPumper.java index 94802214ef..8bc16af2af 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/StreamPumper.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/StreamPumper.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hdfs.server.namenode.ha; +package org.apache.hadoop.ha; import java.io.BufferedReader; import java.io.IOException;