You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by st...@apache.org on 2009/08/26 18:58:43 UTC
svn commit: r808125 - in
/hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server:
datanode/DataNode.java namenode/NameNode.java
Author: stevel
Date: Wed Aug 26 16:58:42 2009
New Revision: 808125
URL: http://svn.apache.org/viewvc?rev=808125&view=rev
Log:
HDFS-326 SFOS-1270 strip the ping operation from the service lifecycle proposal.
Modified:
hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Modified: hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=808125&r1=808124&r2=808125&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java (original)
+++ hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java Wed Aug 26 16:58:42 2009
@@ -251,27 +251,7 @@
public void innerStart() throws IOException {
startDataNode(getConf(), dataDirs);
}
-
- /**
- * {@inheritDoc}.
- *
- * This implementation checks for the IPC server running and the
- * DataNode being registered to a namenode.
- *
- * @param status the initial status
- * @throws IOException for any ping failure
- * @throws LivenessException if the IPC server is not defined
- */
- @Override
- public void innerPing(ServiceStatus status) throws IOException {
- if (ipcServer == null) {
- status.addThrowable(new LivenessException("No IPC Server running"));
- }
- if (dnRegistration == null) {
- status.addThrowable(
- new LivenessException("Not registered to a namenode"));
- }
- }
+
/**
* This method starts the data node with the specified conf.
Modified: hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=808125&r1=808124&r2=808125&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java (original)
+++ hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java Wed Aug 26 16:58:42 2009
@@ -473,33 +473,7 @@
return true;
}
- /**
- * {@inheritDoc}.
- *
- * This implementation checks for the name system being non-null and live
- *
- * @param status status response to build up
- * @throws IOException for IO failure; this will be caught and included
- * in the status message
- */
- @Override
- public void innerPing(ServiceStatus status) throws IOException {
- if (namesystem == null) {
- status.addThrowable(new LivenessException("No name system"));
- } else {
- try {
- namesystem.ping();
- } catch (IOException e) {
- status.addThrowable(e);
- }
- }
- if (httpServer == null || !httpServer.isAlive()) {
- status.addThrowable(
- new LivenessException("NameNode HttpServer is not running"));
- }
- }
-
- /**
+ /**
* Wait for service to finish.
* (Normally, it runs forever.)
*/