Skip to content

HDDS-4199. Fix failed UT: TestOMAllocateBlockRequest#testValidateAndUpdateCache #1379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 3 commits into from
Sep 3, 2020
Merged

HDDS-4199. Fix failed UT: TestOMAllocateBlockRequest#testValidateAndUpdateCache #1379

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0a7d0d
HDDS-4199. Fix failed UT: TestOMAllocateBlockRequest#testValidateAndU…
runzhiwang Sep 3, 2020
6812034
fix code review
runzhiwang Sep 3, 2020
708023a
fix code style
runzhiwang Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions ...ager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,19 @@ public void testPreExecute() throws Exception {

@Test
public void testValidateAndUpdateCache() throws Exception {

OMRequest modifiedOmRequest =
doPreExecute(createAllocateBlockRequest());

OMAllocateBlockRequest omAllocateBlockRequest =
new OMAllocateBlockRequest(modifiedOmRequest);


// Add volume, bucket, key entries to DB.
TestOMRequestUtils.addVolumeAndBucketToDB(volumeName, bucketName,
omMetadataManager);

TestOMRequestUtils.addKeyToTable(true, volumeName, bucketName, keyName,
clientID, replicationType, replicationFactor, omMetadataManager);

OMRequest modifiedOmRequest =
doPreExecute(createAllocateBlockRequest());

OMAllocateBlockRequest omAllocateBlockRequest =
new OMAllocateBlockRequest(modifiedOmRequest);

// Check before calling validateAndUpdateCache. As adding DB entry has
// not added any blocks, so size should be zero.

Expand Down Expand Up @@ -97,8 +95,12 @@ public void testValidateAndUpdateCache() throws Exception {
// Check modification time
Assert.assertEquals(modifiedOmRequest.getAllocateBlockRequest()
.getKeyArgs().getModificationTime(), omKeyInfo.getModificationTime());
Assert.assertNotEquals(omKeyInfo.getCreationTime(),
omKeyInfo.getModificationTime());

// creationTime was assigned at TestOMRequestUtils.addKeyToTable
// modificationTime was assigned at
// doPreExecute(createAllocateBlockRequest())
Assert.assertTrue(
omKeyInfo.getCreationTime() <= omKeyInfo.getModificationTime());

// Check data of the block
OzoneManagerProtocolProtos.KeyLocation keyLocation =
Expand Down