This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new f80f0561bf HDDS-7457. Intermittent failure in TestContainerPersistence
(#4783)
f80f0561bf is described below
commit f80f0561bf15819ae78b1c681a3f154d160f363a
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue May 30 09:14:00 2023 +0200
HDDS-7457. Intermittent failure in TestContainerPersistence (#4783)
---
.../org/apache/hadoop/ozone/container/ContainerTestHelper.java | 9 +++------
.../apache/hadoop/ozone/container/common/ContainerTestUtils.java | 3 +--
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java
index 3e5c237edc..d992fe9f9d 100644
---
a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java
+++
b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java
@@ -27,7 +27,6 @@ import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;
import org.apache.hadoop.conf.StorageUnit;
-import org.apache.hadoop.hdds.HddsUtils;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import
org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ChecksumType;
@@ -38,6 +37,7 @@ import
org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.DatanodeBl
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.KeyValue;
import org.apache.hadoop.hdds.scm.pipeline.MockPipeline;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
+import org.apache.hadoop.hdds.utils.UniqueId;
import org.apache.hadoop.ozone.common.Checksum;
import org.apache.hadoop.ozone.common.ChunkBuffer;
import org.apache.hadoop.ozone.common.OzoneChecksumException;
@@ -542,14 +542,11 @@ public final class ContainerTestHelper {
}
public static BlockID getTestBlockID(long containerID) {
- // Add 2ms delay so that localID based on UtcTime
- // won't collide.
- sleep(2);
- return new BlockID(containerID, HddsUtils.getTime());
+ return new BlockID(containerID, UniqueId.next());
}
public static long getTestContainerID() {
- return HddsUtils.getTime();
+ return UniqueId.next();
}
public static String getFixedLengthString(String string, int length) {
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ContainerTestUtils.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ContainerTestUtils.java
index 2c912b277a..77714c0eb7 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ContainerTestUtils.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ContainerTestUtils.java
@@ -19,7 +19,6 @@ package org.apache.hadoop.ozone.container.common;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.StorageUnit;
-import org.apache.hadoop.hdds.HddsUtils;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
@@ -196,7 +195,7 @@ public final class ContainerTestUtils {
throws IOException {
VolumeChoosingPolicy volumeChoosingPolicy =
new RoundRobinVolumeChoosingPolicy();
- long containerId = HddsUtils.getTime();
+ long containerId = ContainerTestHelper.getTestContainerID();
ContainerLayoutVersion layout = ContainerLayoutVersion.FILE_PER_BLOCK;
KeyValueContainerData keyValueContainerData = new KeyValueContainerData(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
