Author: rangadi
Date: Tue Feb 19 12:40:31 2008
New Revision: 629219
URL: http://svn.apache.org/viewvc?rev=629219&view=rev
Log:
HADOOP-2647. Handle errors while writing to DFS better. (Raghu Angadi)
Modified:
hadoop/core/branches/branch-0.15/CHANGES.txt
hadoop/core/branches/branch-0.15/src/java/org/apache/hadoop/dfs/DFSClient.java
Modified: hadoop/core/branches/branch-0.15/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.15/CHANGES.txt?rev=629219&r1=629218&r2=629219&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.15/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.15/CHANGES.txt Tue Feb 19 12:40:31 2008
@@ -1,5 +1,10 @@
Hadoop Change Log
+Release 0.15.4 - Unreleased
+
+ BUG FIXES
+
+ HADOOP-2647. Handle errors while writing to DFS better. (Raghu Angadi)
Release 0.15.3 - 2008-01-18
Modified:
hadoop/core/branches/branch-0.15/src/java/org/apache/hadoop/dfs/DFSClient.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.15/src/java/org/apache/hadoop/dfs/DFSClient.java?rev=629219&r1=629218&r2=629219&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.15/src/java/org/apache/hadoop/dfs/DFSClient.java
(original)
+++
hadoop/core/branches/branch-0.15/src/java/org/apache/hadoop/dfs/DFSClient.java
Tue Feb 19 12:40:31 2008
@@ -1477,6 +1477,24 @@
}
}
+ /**
+ * Cleans up any resources held. Invoked when the stream is closed or
+ * in case of an error.
+ */
+ private synchronized void cleanup() {
+ if (!closed) {
+ try {
+ closeBackupStream();
+ } catch (IOException e) {
+ // this is not expected. So log is ok.
+ LOG.warn("Unexpected error while closing backup stream : " +
+ StringUtils.stringifyException(e));
+ }
+ deleteBackupFile();
+ closed = true;
+ }
+ }
+
private File newBackupFile() throws IOException {
String name = "tmp" + File.separator +
"client-" + Math.abs(r.nextLong());
@@ -1582,26 +1600,36 @@
protected void writeChunk(byte[] b, int offset, int len, byte[] checksum)
throws IOException {
checkOpen();
- int bytesPerChecksum = this.checksum.getBytesPerChecksum();
- if (len > bytesPerChecksum || (len + bytesWrittenToBlock) > blockSize) {
- // should never happen
- throw new IOException("Mismatch in writeChunk() args");
+ if (closed) {
+ throw new IOException("Stream is closed or can not be written to.");
}
+
+ int bytesPerChecksum = this.checksum.getBytesPerChecksum();
- if ( backupFile == null ) {
- openBackupStream();
- }
+ try {
+ if (len > bytesPerChecksum || (len + bytesWrittenToBlock) > blockSize)
{
+ // should never happen
+ throw new IOException("Mismatch in writeChunk() args");
+ }
- backupStream.write(b, offset, len);
- backupStream.write(checksum);
+ if ( backupFile == null ) {
+ openBackupStream();
+ }
- bytesWrittenToBlock += len;
- filePos += len;
+ backupStream.write(b, offset, len);
+ backupStream.write(checksum);
- if ( bytesWrittenToBlock >= blockSize ) {
- endBlock();
+ bytesWrittenToBlock += len;
+ filePos += len;
+
+ if ( bytesWrittenToBlock >= blockSize ) {
+ endBlock();
+ }
+ } catch (IOException e) {
+ //No more writes can be allowed on this stream.
+ cleanup();
+ throw e;
}
-
}
/**
@@ -1722,12 +1750,12 @@
public synchronized void close() throws IOException {
checkOpen();
if (closed) {
- throw new IOException("Stream closed");
+ return; // closing multiple times is ok.
}
- flushBuffer();
-
try {
+ flushBuffer();
+
if (filePos == 0 || bytesWrittenToBlock != 0) {
try {
endBlock();
@@ -1756,8 +1784,8 @@
}
}
}
- closed = true;
} finally {
+ cleanup();
synchronized (pendingCreates) {
pendingCreates.remove(src.toString());
}
