Author: eli
Date: Thu Feb 2 19:20:32 2012
New Revision: 1239774
URL: http://svn.apache.org/viewvc?rev=1239774&view=rev
Log:
HADOOP-7991. HA: the FailoverController should check the standby is ready
before failing over. Contributed by Eli Collins
Modified:
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
Modified:
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=1239774&r1=1239773&r2=1239774&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Thu Feb 2 19:20:32 2012
@@ -929,6 +929,13 @@ public class NameNode {
return state.getServiceState();
}
+ synchronized boolean readyToBecomeActive() throws ServiceFailedException {
+ if (!haEnabled) {
+ throw new ServiceFailedException("HA for namenode is not enabled");
+ }
+ return !isInSafeMode();
+ }
+
/**
* Class used as expose {@link NameNode} as context to {@link HAState}
Modified:
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java?rev=1239774&r1=1239773&r2=1239774&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
Thu Feb 2 19:20:32 2012
@@ -1007,6 +1007,11 @@ class NameNodeRpcServer implements Namen
return nn.getServiceState();
}
+ @Override // HAServiceProtocol
+ public synchronized boolean readyToBecomeActive() throws
ServiceFailedException {
+ return nn.readyToBecomeActive();
+ }
+
/**
* Verify version.
*
