diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java index 5e4a4c43b62..f309da041a7 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java @@ -53,14 +53,6 @@ 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); @@ -68,6 +60,12 @@ public void testValidateAndUpdateCache() throws Exception { 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. @@ -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 =