big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDDS-1602. Fix TestContainerPersistence#testDeleteBlockTwice. (#858)

Browse Source
This commit is contained in:
Bharat Viswanadham 2019-05-28 11:27:16 -07:00 committed by GitHub
parent d1ec1c52e5
commit d8b18e82f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java
View File

@ -229,12 +229,13 @@ public void deleteBlock(Container container, BlockID blockID) throws
// to delete a Block which might have just gotten inserted after // to delete a Block which might have just gotten inserted after
// the get check. // the get check.
byte[] kKey = Longs.toByteArray(blockID.getLocalID()); byte[] kKey = Longs.toByteArray(blockID.getLocalID());
try {
db.getStore().delete(kKey); byte[] kData = db.getStore().get(kKey);
} catch (IOException e) { if (kData == null) {
throw new StorageContainerException("Unable to find the block.", throw new StorageContainerException("Unable to find the block.",
NO_SUCH_BLOCK); NO_SUCH_BLOCK);
} }
db.getStore().delete(kKey);
// Decrement blockcount here // Decrement blockcount here
container.getContainerData().decrKeyCount(); container.getContainerData().decrKeyCount();
} }