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/27 19:05:37 UTC
svn commit: r808528 - in
/hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server:
datanode/DataNode.java namenode/NameNode.java
Author: stevel
Date: Thu Aug 27 17:05:37 2009
New Revision: 808528
URL: http://svn.apache.org/viewvc?rev=808528&view=rev
Log:
HDFS-326 innerStart() can throw InterruptedException
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=808528&r1=808527&r2=808528&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 Thu Aug 27 17:05:37 2009
@@ -246,9 +246,10 @@
* Start any work (in separate threads)
*
* @throws IOException for any startup failure
+ * @throws InterruptedException if the thread was interrupted on startup
*/
@Override
- public void innerStart() throws IOException {
+ public void innerStart() throws IOException, InterruptedException {
startDataNode(getConf(), dataDirs);
}
@@ -265,7 +266,7 @@
*/
void startDataNode(Configuration conf,
AbstractList<File> dataDirs
- ) throws IOException {
+ ) throws IOException, InterruptedException {
// use configured nameserver & interface to get local hostname
if (conf.get("slave.host.name") != null) {
machineName = conf.get("slave.host.name");
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=808528&r1=808527&r2=808528&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 Thu Aug 27 17:05:37 2009
@@ -453,10 +453,11 @@
* Any subclasses that do not consider themsevles to be live once
* any subclassed initialize method has returned should override the method
* {@link #goLiveAtTheEndOfStart()} to change that behavior.
- * @throws IOException for any problem.
+ * @throws IOException for any problem that prevented startup.
+ * @throws InterruptedException if the thread was interrupted on startup
*/
@Override
- protected void innerStart() throws IOException {
+ protected void innerStart() throws IOException, InterruptedException {
initialize(getConf());
if(goLiveAtTheEndOfStart()) {
setServiceState(ServiceState.LIVE);