Repository: hadoop Updated Branches: refs/heads/HDFS-7240 3440ca6e0 -> d0488c781
HDFS-13368. Ozone:TestEndPoint tests are failing consistently. Contributed by Shashikant Banerjee. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d0488c78 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d0488c78 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d0488c78 Branch: refs/heads/HDFS-7240 Commit: d0488c781ba50bc293f0c960efd1970dffa01731 Parents: 3440ca6 Author: Nanda kumar <[email protected]> Authored: Thu Mar 29 21:06:10 2018 +0530 Committer: Nanda kumar <[email protected]> Committed: Thu Mar 29 21:06:10 2018 +0530 ---------------------------------------------------------------------- hadoop-hdsl/server-scm/pom.xml | 6 +++++- .../hadoop/ozone/container/common/TestEndPoint.java | 11 +++++------ 2 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d0488c78/hadoop-hdsl/server-scm/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdsl/server-scm/pom.xml b/hadoop-hdsl/server-scm/pom.xml index a6fcf3f..802120b 100644 --- a/hadoop-hdsl/server-scm/pom.xml +++ b/hadoop-hdsl/server-scm/pom.xml @@ -87,6 +87,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <scope>test</scope> </dependency> <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-core</artifactId> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> @@ -162,4 +166,4 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/hadoop/blob/d0488c78/hadoop-hdsl/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java ---------------------------------------------------------------------- diff --git a/hadoop-hdsl/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java b/hadoop-hdsl/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java index 825efaa..6f8cc2d 100644 --- a/hadoop-hdsl/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java +++ b/hadoop-hdsl/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java @@ -214,7 +214,7 @@ public class TestEndPoint { SCMRegisteredCmdResponseProto responseProto = rpcEndPoint.getEndPoint() .register(nodeToRegister.getProtoBufMessage(), scmAddressArray); Assert.assertNotNull(responseProto); - Assert.assertEquals(nodeToRegister.getUuid(), + Assert.assertEquals(nodeToRegister.getUuidString(), responseProto.getDatanodeUUID()); Assert.assertNotNull(responseProto.getClusterID()); } @@ -230,11 +230,10 @@ public class TestEndPoint { RegisterEndpointTask endpointTask = new RegisterEndpointTask(rpcEndPoint, conf); if (!clearDatanodeDetails) { - HdslProtos.DatanodeDetailsProto datanodeDetails = - HdslProtos.DatanodeDetailsProto.newBuilder() - .setUuid(UUID.randomUUID().toString()) - .build(); - endpointTask.setDatanodeDetailsProto(datanodeDetails); + DatanodeDetails datanodeDetails = TestUtils.getDatanodeDetails(); + HdslProtos.DatanodeDetailsProto datanodeDetailsProto = + datanodeDetails.getProtoBufMessage(); + endpointTask.setDatanodeDetailsProto(datanodeDetailsProto); } endpointTask.call(); return rpcEndPoint; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
