Author: cutting
Date: Tue May 15 14:08:52 2007
New Revision: 538320
URL: http://svn.apache.org/viewvc?view=rev&rev=538320
Log:
Merge -r 538313:538318 from trunk to 0.13 branch. Fixes: HADOOP-1205,
HADOOP-1353, HADOOP-1354 and HADOOP-1358.
Modified:
lucene/hadoop/branches/branch-0.13/CHANGES.txt
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/dfs/DFSClient.java
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/dfs/FSNamesystem.java
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/fs/FsShell.java
Modified: lucene/hadoop/branches/branch-0.13/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.13/CHANGES.txt?view=diff&rev=538320&r1=538319&r2=538320
==============================================================================
--- lucene/hadoop/branches/branch-0.13/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.13/CHANGES.txt Tue May 15 14:08:52 2007
@@ -378,6 +378,18 @@
112. HADOOP-1345. Fix HDFS to correctly retry another replica when a
checksum error is encountered. (Hairong Kuang via cutting)
+113. HADOOP-1205. Improve synchronization around HDFS block map.
+ (Hairong Kuang via cutting)
+
+114. HADOOP-1353. Fix a potential NullPointerException in namenode.
+ (Dhruba Borthakur via cutting)
+
+115. HADOOP-1354. Fix a potential NullPointerException in FsShell.
+ (Hairong Kuang via cutting)
+
+116. HADOOP-1358. Fix a potential bug when DFSClient calls skipBytes.
+ (Hairong Kuang via cutting)
+
Release 0.12.3 - 2007-04-06
Modified:
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/dfs/DFSClient.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/dfs/DFSClient.java?view=diff&rev=538320&r1=538319&r2=538320
==============================================================================
---
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/dfs/DFSClient.java
(original)
+++
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/dfs/DFSClient.java
Tue May 15 14:08:52 2007
@@ -926,10 +926,11 @@
//
int diff = (int)(targetPos - pos);
if (diff <= TCP_WINDOW_SIZE) {
- blockStream.skipBytes(diff);
- pos += diff;
- assert(pos == targetPos);
- done = true;
+ int adiff = blockStream.skipBytes(diff);
+ pos += adiff;
+ if (pos == targetPos) {
+ done = true;
+ }
}
}
if (!done) {
Modified:
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/dfs/FSNamesystem.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/dfs/FSNamesystem.java?view=diff&rev=538320&r1=538319&r2=538320
==============================================================================
---
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/dfs/FSNamesystem.java
(original)
+++
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/dfs/FSNamesystem.java
Tue May 15 14:08:52 2007
@@ -434,7 +434,7 @@
* The client should choose one of the machines from the machineArray
* at random.
*/
- public Object[] open(String clientMachine, UTF8 src) {
+ synchronized public Object[] open(String clientMachine, UTF8 src) {
Object results[] = null;
Block blocks[] = dir.getFile(src);
if (blocks != null) {
@@ -1813,7 +1813,7 @@
removeDatanode(nodeInfo);
} else {
NameNode.stateChangeLog.warn("BLOCK* NameSystem.removeDatanode: "
- + nodeInfo.getName() + " does not exist");
+ + nodeID.getName() + " does not exist");
}
}
Modified:
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/fs/FsShell.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/fs/FsShell.java?view=diff&rev=538320&r1=538319&r2=538320
==============================================================================
---
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/fs/FsShell.java
(original)
+++
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/fs/FsShell.java
Tue May 15 14:08:52 2007
@@ -369,7 +369,7 @@
*/
public void dus(String src) throws IOException {
Path paths[] = fs.globPaths(new Path(src));
- if (paths==null && paths.length==0) {
+ if (paths==null || paths.length==0) {
throw new IOException("dus: No match: " + src);
}
for(int i=0; i<paths.length; i++) {
