You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by ar...@apache.org on 2014/06/23 20:21:33 UTC
svn commit: r1604900 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt
src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
Author: arp
Date: Mon Jun 23 18:21:33 2014
New Revision: 1604900
URL: http://svn.apache.org/r1604900
Log:
HDFS-6587: Merging r1604899 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1604900&r1=1604899&r2=1604900&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Mon Jun 23 18:21:33 2014
@@ -445,6 +445,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6580. FSNamesystem.mkdirsInt should call the getAuditFileInfo()
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
HDFS-6299. Protobuf for XAttr and client-side implementation. (Yi Liu via umamahesh)
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java?rev=1604900&r1=1604899&r2=1604900&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java Mon Jun 23 18:21:33 2014
@@ -435,8 +435,9 @@ public class TestBPOfferService {
}
private ReceivedDeletedBlockInfo[] waitForBlockReceived(
- ExtendedBlock fakeBlock,
- DatanodeProtocolClientSideTranslatorPB mockNN) throws Exception {
+ final ExtendedBlock fakeBlock,
+ final DatanodeProtocolClientSideTranslatorPB mockNN) throws Exception {
+ final String fakeBlockPoolId = fakeBlock.getBlockPoolId();
final ArgumentCaptor<StorageReceivedDeletedBlocks[]> captor =
ArgumentCaptor.forClass(StorageReceivedDeletedBlocks[].class);
GenericTestUtils.waitFor(new Supplier<Boolean>() {
@@ -444,9 +445,9 @@ public class TestBPOfferService {
@Override
public Boolean get() {
try {
- Mockito.verify(mockNN1).blockReceivedAndDeleted(
+ Mockito.verify(mockNN).blockReceivedAndDeleted(
Mockito.<DatanodeRegistration>anyObject(),
- Mockito.eq(FAKE_BPID),
+ Mockito.eq(fakeBlockPoolId),
captor.capture());
return true;
} catch (Throwable t) {