Author: hitesh
Date: Thu Dec 12 22:57:40 2013
New Revision: 1550571
URL: http://svn.apache.org/r1550571
Log:
Merge 1550570 from trunk to branch-2 for HADOOP-8753. LocalDirAllocator throws
ArithmeticException: divide by zero when there is no available space on
configured local dir. Contributed by Benoy Antony.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalDirAllocator.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1550571&r1=1550570&r2=1550571&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Thu Dec 12 22:57:40 2013
@@ -178,6 +178,9 @@ Release 2.4.0 - UNRELEASED
TestFileContextResolveAfs and TestStat in branch-2 (Mit Desai via Colin
Patrick McCabe)
+ HADOOP-8753. LocalDirAllocator throws "ArithmeticException: / by zero" when
+ there is no available space on configured local dir. (Benoy Antony via
hitesh)
+
Release 2.3.0 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalDirAllocator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalDirAllocator.java?rev=1550571&r1=1550570&r2=1550571&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalDirAllocator.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalDirAllocator.java
Thu Dec 12 22:57:40 2013
@@ -362,6 +362,10 @@ public class LocalDirAllocator {
totalAvailable += availableOnDisk[i];
}
+ if (totalAvailable == 0){
+ throw new DiskErrorException("No space available in any of the local
directories.");
+ }
+
// Keep rolling the wheel till we get a valid path
Random r = new java.util.Random();
while (numDirsSearched < numDirs && returnPath == null) {
