You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by el...@apache.org on 2021/02/24 08:46:08 UTC
[ozone] 19/27: additional improvements
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch HDDS-3816-ec
in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 068995895c24cedbc1f06d37f02b1a66db0d10c0
Author: Elek Márton <el...@apache.org>
AuthorDate: Tue Feb 16 14:35:37 2021 +0100
additional improvements
---
.../replication/TestReplicationService.java | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestReplicationService.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestReplicationService.java
index bdf8279..5360eac 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestReplicationService.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestReplicationService.java
@@ -39,6 +39,7 @@ import org.apache.hadoop.test.GenericTestUtils;
import com.google.common.base.Supplier;
import com.google.common.collect.Maps;
+import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import org.junit.Test;
/**
@@ -53,33 +54,35 @@ public class TestReplicationService {
//start server
ConfigurationSource ozoneConfig = new OzoneConfiguration();
- final String datanodeUUID = UUID.randomUUID().toString();
+ final String sourceDnUUID = UUID.randomUUID().toString();
+ final String destDnUUID = UUID.randomUUID().toString();
MutableVolumeSet sourceVolumes =
- new MutableVolumeSet(datanodeUUID, ozoneConfig);
+ new MutableVolumeSet(sourceDnUUID, ozoneConfig);
+
VolumeChoosingPolicy v = new RoundRobinVolumeChoosingPolicy();
final HddsVolume volume =
v.chooseVolume(sourceVolumes.getVolumesList(), 5L);
KeyValueContainerData kvd = new KeyValueContainerData(1L, "/tmp/asd");
- kvd.setState(State.CLOSED);
+ kvd.setState(State.OPEN);
kvd.assignToVolume(scmUuid.toString(), volume);
kvd.setSchemaVersion(OzoneConsts.SCHEMA_V2);
KeyValueContainer kvc = new KeyValueContainer(kvd, ozoneConfig);
+ kvc.create(sourceVolumes, v, scmUuid.toString());
ContainerSet sourceContainerSet = new ContainerSet();
sourceContainerSet.addContainer(kvc);
KeyValueHandler handler = new KeyValueHandler(ozoneConfig,
- datanodeUUID, sourceContainerSet, sourceVolumes,
+ sourceDnUUID, sourceContainerSet, sourceVolumes,
new ContainerMetrics(new int[] {}),
containerReplicaProto -> {
-
});
final ContainerCommandRequestProto containerCommandRequest =
ContainerCommandRequestProto.newBuilder()
.setCmdType(Type.WriteChunk)
- .setDatanodeUuid(datanodeUUID)
+ .setDatanodeUuid(destDnUUID)
.setContainerID(kvc.getContainerData().getContainerID())
.setWriteChunk(WriteChunkRequestProto.newBuilder()
.setBlockID(DatanodeBlockID.newBuilder()
@@ -87,6 +90,7 @@ public class TestReplicationService {
.setBlockCommitSequenceId(1L)
.setLocalID(1L)
.build())
+ .setData(ByteString.copyFromUtf8("asdf"))
.setChunkData(ChunkInfo.newBuilder()
.setChunkName("chunk1")
.setOffset(1L)
@@ -117,9 +121,10 @@ public class TestReplicationService {
replicationServer.start();
//start client
-
+ OzoneConfiguration clientConfig = new OzoneConfiguration();
+ clientConfig.set("hdds.datanode.dir","tmp/qwe");
MutableVolumeSet volumeSet =
- new MutableVolumeSet(datanodeUUID, ozoneConfig);
+ new MutableVolumeSet(destDnUUID, clientConfig);
DownloadAndImportReplicator replicator = new DownloadAndImportReplicator(
ozoneConfig,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org