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

HDFS-6587: Merging r1604899 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604900 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arpit Agarwal 2014-06-23 18:21:33 +00:00
parent 3395e01504
commit dd90472574
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -445,6 +445,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6580. FSNamesystem.mkdirsInt should call the getAuditFileInfo() HDFS-6580. FSNamesystem.mkdirsInt should call the getAuditFileInfo()
wrapper. (Zhilei Xu via wheat9) wrapper. (Zhilei Xu via wheat9)
HDFS-6587. Bug in TestBPOfferService can cause test failure. (Zhilei Xu
via Arpit Agarwal)
BREAKDOWN OF HDFS-2006 SUBTASKS AND RELATED JIRAS BREAKDOWN OF HDFS-2006 SUBTASKS AND RELATED JIRAS
HDFS-6299. Protobuf for XAttr and client-side implementation. (Yi Liu via umamahesh) HDFS-6299. Protobuf for XAttr and client-side implementation. (Yi Liu via umamahesh)

9
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
View File

@ -435,8 +435,9 @@ public class TestBPOfferService {
} }
private ReceivedDeletedBlockInfo[] waitForBlockReceived( private ReceivedDeletedBlockInfo[] waitForBlockReceived(
ExtendedBlock fakeBlock, final ExtendedBlock fakeBlock,
DatanodeProtocolClientSideTranslatorPB mockNN) throws Exception { final DatanodeProtocolClientSideTranslatorPB mockNN) throws Exception {
final String fakeBlockPoolId = fakeBlock.getBlockPoolId();
final ArgumentCaptor<StorageReceivedDeletedBlocks[]> captor = final ArgumentCaptor<StorageReceivedDeletedBlocks[]> captor =
ArgumentCaptor.forClass(StorageReceivedDeletedBlocks[].class); ArgumentCaptor.forClass(StorageReceivedDeletedBlocks[].class);
GenericTestUtils.waitFor(new Supplier<Boolean>() { GenericTestUtils.waitFor(new Supplier<Boolean>() {
@ -444,9 +445,9 @@ public class TestBPOfferService {
@Override @Override
public Boolean get() { public Boolean get() {
try { try {
Mockito.verify(mockNN1).blockReceivedAndDeleted( Mockito.verify(mockNN).blockReceivedAndDeleted(
Mockito.<DatanodeRegistration>anyObject(), Mockito.<DatanodeRegistration>anyObject(),
Mockito.eq(FAKE_BPID), Mockito.eq(fakeBlockPoolId),
captor.capture()); captor.capture());
return true; return true;
} catch (Throwable t) { } catch (Throwable t) {