This is an automated email from the ASF dual-hosted git repository. sammichen pushed a commit to branch HDDS-1564 in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit 3e6f02d8811e8a57550f2cd204637e2387441aa4 Author: Li Cheng <[email protected]> AuthorDate: Mon Dec 23 15:52:37 2019 +0800 Resolve rebase conflict. --- .../hdds/scm/pipeline/TestPipelineDatanodesIntersection.java | 2 +- .../hadoop/hdds/scm/pipeline/TestPipelinePlacementPolicy.java | 2 +- .../hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineDatanodesIntersection.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineDatanodesIntersection.java index 45f85ef..87e8cf4 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineDatanodesIntersection.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineDatanodesIntersection.java @@ -79,7 +79,7 @@ public class TestPipelineDatanodesIntersection { NodeManager nodeManager= new MockNodeManager(true, nodeCount); conf.setInt(OZONE_DATANODE_MAX_PIPELINE_ENGAGEMENT, nodeHeaviness); conf.setBoolean(OZONE_SCM_PIPELINE_AUTO_CREATE_FACTOR_ONE, false); - PipelineStateManager stateManager = new PipelineStateManager(conf); + PipelineStateManager stateManager = new PipelineStateManager(); PipelineProvider provider = new MockRatisPipelineProvider(nodeManager, stateManager, conf); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementPolicy.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementPolicy.java index 1e34039..2fe67f9 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementPolicy.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementPolicy.java @@ -52,7 +52,7 @@ public class TestPipelinePlacementPolicy { conf = new OzoneConfiguration(); conf.setInt(OZONE_DATANODE_MAX_PIPELINE_ENGAGEMENT, 5); placementPolicy = new PipelinePlacementPolicy( - nodeManager, new PipelineStateManager(conf), conf); + nodeManager, new PipelineStateManager(), conf); } @Test diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java index 46fd8c8..77407ab 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java @@ -39,8 +39,6 @@ import java.util.UUID; import java.util.stream.Collectors; import static org.apache.commons.collections.CollectionUtils.intersection; -import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_MAX_PIPELINE_ENGAGEMENT; -import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_MAX_PIPELINE_ENGAGEMENT_DEFAULT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; @@ -57,12 +55,14 @@ public class TestRatisPipelineProvider { private PipelineProvider provider; private PipelineStateManager stateManager; private OzoneConfiguration conf; + private static int MAX_PIPELINE_ENGAGEMENT = 2; @Before public void init() throws Exception { nodeManager = new MockNodeManager(true, 10); OzoneConfiguration conf = new OzoneConfiguration(); - conf.setInt(ScmConfigKeys.OZONE_DATANODE_MAX_PIPELINE_ENGAGEMENT, 2); + conf.setInt(ScmConfigKeys.OZONE_DATANODE_MAX_PIPELINE_ENGAGEMENT, + MAX_PIPELINE_ENGAGEMENT); stateManager = new PipelineStateManager(); provider = new MockRatisPipelineProvider(nodeManager, stateManager, conf); @@ -194,8 +194,7 @@ public class TestRatisPipelineProvider { // Use up first 3 DNs for an open pipeline. List<DatanodeDetails> dns = healthyNodes.subList(0, 3); - for (int i = 0; i < conf.getInt(OZONE_DATANODE_MAX_PIPELINE_ENGAGEMENT, - OZONE_DATANODE_MAX_PIPELINE_ENGAGEMENT_DEFAULT); i++) { + for (int i = 0; i < MAX_PIPELINE_ENGAGEMENT; i++) { // Saturate pipeline counts on all the 1st 3 DNs. addPipeline(dns, factor, Pipeline.PipelineState.OPEN, REPLICATION_TYPE); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
