Repository: hadoop Updated Branches: refs/heads/branch-2.7 1b139593c -> 33b961ee8
HDFS-8578. On upgrade, Datanode should process all storage/data dirs in parallel. Contributed by vinayakumarb and szetszwo Addendum to fix compilation Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/33b961ee Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/33b961ee Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/33b961ee Branch: refs/heads/branch-2.7 Commit: 33b961ee88097d34f6b1d87ca72389613a4eb1dc Parents: 1b13959 Author: Vinayakumar B <[email protected]> Authored: Tue Feb 23 14:39:24 2016 +0530 Committer: Vinayakumar B <[email protected]> Committed: Tue Feb 23 14:39:24 2016 +0530 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/server/datanode/DataStorage.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/33b961ee/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java index 484c6ae..8656ae9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java @@ -22,6 +22,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InterruptedIOException; import java.io.RandomAccessFile; import java.nio.channels.FileLock; import java.util.ArrayList; @@ -54,7 +55,6 @@ import org.apache.hadoop.fs.LocalFileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.hdfs.DFSConfigKeys; -import org.apache.hadoop.hdfs.DFSUtilClient; import org.apache.hadoop.hdfs.HdfsConfiguration; import org.apache.hadoop.hdfs.protocol.Block; import org.apache.hadoop.hdfs.protocol.HdfsConstants; @@ -441,7 +441,8 @@ public class DataStorage extends Storage { } catch (ExecutionException e) { LOG.warn("Failed to upgrade storage directory " + t.dataDir, e); } catch (InterruptedException e) { - throw DFSUtilClient.toInterruptedIOException("Task interrupted", e); + throw (InterruptedIOException) new InterruptedIOException( + "Task interrupted").initCause(e); } } } @@ -490,7 +491,8 @@ public class DataStorage extends Storage { LOG.warn("Failed to upgrade storage directory " + t.dataDir + " for block pool " + bpid, e); } catch (InterruptedException e) { - throw DFSUtilClient.toInterruptedIOException("Task interrupted", e); + throw (InterruptedIOException) new InterruptedIOException( + "Task interrupted").initCause(e); } } }
