Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-8870. Lease is leaked on write failure. Contributed by Kuhu Shukla. 

(cherry picked from commit 4fcea8a0c8)
This commit is contained in:
Kihwal Lee 2016-11-15 14:51:34 -06:00
parent 4e0fcff8ab
commit f08e227671
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
View File

@ -726,8 +726,6 @@ public class DFSOutputStream extends FSOutputSummer
b.add(e); b.add(e);
} }
} }
dfsClient.endFileLease(fileId);
final IOException ioe = b.build(); final IOException ioe = b.build();
if (ioe != null) { if (ioe != null) {
throw ioe; throw ioe;
@ -740,6 +738,7 @@ public class DFSOutputStream extends FSOutputSummer
void setClosed() { void setClosed() {
closed = true; closed = true;
dfsClient.endFileLease(fileId);
getStreamer().release(); getStreamer().release();
} }
@ -773,8 +772,6 @@ public class DFSOutputStream extends FSOutputSummer
b.add(e); b.add(e);
} }
} }
dfsClient.endFileLease(fileId);
final IOException ioe = b.build(); final IOException ioe = b.build();
if (ioe != null) { if (ioe != null) {
throw ioe; throw ioe;

19
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSOutputStream.java
View File

@ -50,6 +50,11 @@ import org.junit.AfterClass;
import org.junit.Assert; import org.junit.Assert;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyLong;
import org.mockito.Mockito;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.mockito.internal.util.reflection.Whitebox; import org.mockito.internal.util.reflection.Whitebox;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -202,6 +207,20 @@ public class TestDFSOutputStream {
assertEquals(1, 3 - numDataNodesWithData); assertEquals(1, 3 - numDataNodesWithData);
} }
@Test
public void testEndLeaseCall() throws Exception {
Configuration conf = new Configuration();
DFSClient client = new DFSClient(cluster.getNameNode(0)
.getNameNodeAddress(), conf);
DFSClient spyClient = Mockito.spy(client);
DFSOutputStream dfsOutputStream = spyClient.create("/file2",
FsPermission.getFileDefault(),
EnumSet.of(CreateFlag.CREATE), (short) 3, 1024, null , 1024, null);
DFSOutputStream spyDFSOutputStream = Mockito.spy(dfsOutputStream);
spyDFSOutputStream.closeThreads(anyBoolean());
verify(spyClient, times(1)).endFileLease(anyLong());
}
@AfterClass @AfterClass
public static void tearDown() { public static void tearDown() {
if (cluster != null) { if (cluster != null) {