HDDS-762. Fix unit test failure for TestContainerSQLCli & TestSCMMetrics. Contributed by Mukul Kumar Singh.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e33b61f3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e33b61f3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e33b61f3 Branch: refs/heads/HDDS-4 Commit: e33b61f3351c09b00717f6eef32ff7d24345d06e Parents: f747f5b Author: Anu Engineer <aengin...@apache.org> Authored: Tue Oct 30 19:16:52 2018 -0700 Committer: Anu Engineer <aengin...@apache.org> Committed: Tue Oct 30 19:16:52 2018 -0700 ---------------------------------------------------------------------- hadoop-hdds/pom.xml | 2 +- .../common/transport/server/ratis/TestCSMMetrics.java | 10 +++++++--- hadoop-ozone/pom.xml | 2 +- .../org/apache/hadoop/ozone/scm/TestContainerSQLCli.java | 3 ++- 4 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e33b61f3/hadoop-hdds/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml index f960e90..090a537 100644 --- a/hadoop-hdds/pom.xml +++ b/hadoop-hdds/pom.xml @@ -45,7 +45,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <hdds.version>0.4.0-SNAPSHOT</hdds.version> <!-- Apache Ratis version --> - <ratis.version>0.3.0-2272086-SNAPSHOT</ratis.version> + <ratis.version>0.3.0-1d2ebee-SNAPSHOT</ratis.version> <bouncycastle.version>1.60</bouncycastle.version> http://git-wip-us.apache.org/repos/asf/hadoop/blob/e33b61f3/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java index a5a9641..67db7ff 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java @@ -47,6 +47,7 @@ import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import static org.apache.ratis.rpc.SupportedRpcType.GRPC; +import org.apache.ratis.protocol.RaftGroupId; import org.apache.ratis.util.CheckedBiConsumer; import java.util.function.BiConsumer; @@ -104,7 +105,8 @@ public class TestCSMMetrics { client.connect(); // Before Read Chunk/Write Chunk - MetricsRecordBuilder metric = getMetrics(CSMMetrics.SOURCE_NAME); + MetricsRecordBuilder metric = getMetrics(CSMMetrics.SOURCE_NAME + + RaftGroupId.valueOf(pipeline.getId().getId()).toString()); assertCounter("NumWriteStateMachineOps", 0L, metric); assertCounter("NumReadStateMachineOps", 0L, metric); assertCounter("NumApplyTransactionOps", 0L, metric); @@ -120,7 +122,8 @@ public class TestCSMMetrics { Assert.assertEquals(ContainerProtos.Result.SUCCESS, response.getResult()); - metric = getMetrics(CSMMetrics.SOURCE_NAME); + metric = getMetrics(CSMMetrics.SOURCE_NAME + + RaftGroupId.valueOf(pipeline.getId().getId()).toString()); assertCounter("NumWriteStateMachineOps", 1L, metric); assertCounter("NumApplyTransactionOps", 1L, metric); @@ -132,7 +135,8 @@ public class TestCSMMetrics { Assert.assertEquals(ContainerProtos.Result.SUCCESS, response.getResult()); - metric = getMetrics(CSMMetrics.SOURCE_NAME); + metric = getMetrics(CSMMetrics.SOURCE_NAME + + RaftGroupId.valueOf(pipeline.getId().getId()).toString()); assertCounter("NumReadStateMachineOps", 1L, metric); assertCounter("NumApplyTransactionOps", 1L, metric); } finally { http://git-wip-us.apache.org/repos/asf/hadoop/blob/e33b61f3/hadoop-ozone/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index 2fcffab..33af31b 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -33,7 +33,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <hadoop.version>3.2.1-SNAPSHOT</hadoop.version> <hdds.version>0.4.0-SNAPSHOT</hdds.version> <ozone.version>0.4.0-SNAPSHOT</ozone.version> - <ratis.version>0.3.0-2272086-SNAPSHOT</ratis.version> + <ratis.version>0.3.0-1d2ebee-SNAPSHOT</ratis.version> <bouncycastle.version>1.60</bouncycastle.version> <ozone.release>Badlands</ozone.release> <declared.ozone.version>${ozone.version}</declared.ozone.version> http://git-wip-us.apache.org/repos/asf/hadoop/blob/e33b61f3/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java index 9117838..054e668 100644 --- a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java +++ b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java @@ -22,6 +22,7 @@ import org.apache.hadoop.hdds.scm.container.SCMContainerManager; import org.apache.hadoop.hdds.scm.events.SCMEvents; import org.apache.hadoop.hdds.scm.node.NodeManager; import org.apache.hadoop.hdds.scm.pipeline.PipelineManager; +import org.apache.hadoop.hdds.scm.pipeline.SCMPipelineManager; import org.apache.hadoop.hdds.server.events.EventQueue; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; @@ -122,7 +123,7 @@ public class TestContainerSQLCli { eventQueue = new EventQueue(); nodeManager = cluster.getStorageContainerManager().getScmNodeManager(); PipelineManager pipelineManager = - cluster.getStorageContainerManager().getPipelineManager(); + new SCMPipelineManager(conf, nodeManager, eventQueue); containerManager = new SCMContainerManager(conf, nodeManager, pipelineManager, eventQueue); blockManager = new BlockManagerImpl( --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
