This is an automated email from the ASF dual-hosted git repository.
avijayan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new e4ee2f3 HDDS-3449. Enable TestSCMPipelineMetrics test cases (#892)
e4ee2f3 is described below
commit e4ee2f3c74c96c8bb59007a20ccafdc1bc51ae9c
Author: Neo Yang <[email protected]>
AuthorDate: Wed May 6 02:52:58 2020 +0800
HDDS-3449. Enable TestSCMPipelineMetrics test cases (#892)
---
.../ozone/scm/pipeline/TestSCMPipelineMetrics.java | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestSCMPipelineMetrics.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestSCMPipelineMetrics.java
index cf0dcf4..f86c081 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestSCMPipelineMetrics.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestSCMPipelineMetrics.java
@@ -32,7 +32,6 @@ import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import java.io.IOException;
@@ -45,7 +44,6 @@ import static
org.apache.hadoop.test.MetricsAsserts.getMetrics;
/**
* Test cases to verify the metrics exposed by SCMPipelineManager.
*/
-@Ignore
public class TestSCMPipelineMetrics {
private MiniOzoneCluster cluster;
@@ -83,16 +81,15 @@ public class TestSCMPipelineMetrics {
Optional<Pipeline> pipeline = pipelineManager
.getPipelines().stream().findFirst();
Assert.assertTrue(pipeline.isPresent());
- pipeline.ifPresent(pipeline1 -> {
- try {
- cluster.getStorageContainerManager()
- .getClientProtocolServer().closePipeline(
- pipeline.get().getId().getProtobuf());
- } catch (IOException e) {
- e.printStackTrace();
- Assert.fail();
- }
- });
+ try {
+ cluster.getStorageContainerManager()
+ .getPipelineManager()
+ .finalizeAndDestroyPipeline(
+ pipeline.get(), false);
+ } catch (IOException e) {
+ e.printStackTrace();
+ Assert.fail();
+ }
MetricsRecordBuilder metrics = getMetrics(
SCMPipelineMetrics.class.getSimpleName());
assertCounter("NumPipelineDestroyed", 1L, metrics);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
