You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by sa...@apache.org on 2020/02/10 02:23:24 UTC
[hadoop-ozone] 06/18: Rebase Fix
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 e98c12f512101585e9402b32ccd0ab42e87a7610
Author: Sammi Chen <sa...@apache.org>
AuthorDate: Tue Dec 3 16:32:08 2019 +0800
Rebase Fix
---
.../apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java | 6 +++---
.../org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineManager.java | 6 ++++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java
index 7513cad..ff52470 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java
@@ -36,9 +36,9 @@ public class MockRatisPipelineProvider extends RatisPipelineProvider {
private boolean autoOpenPipeline;
public MockRatisPipelineProvider(NodeManager nodeManager,
- PipelineStateManager stateManager,
- Configuration conf, boolean autoOpen) {
- super(nodeManager, stateManager, conf, null);
+ PipelineStateManager stateManager, Configuration conf,
+ EventPublisher eventPublisher, boolean autoOpen) {
+ super(nodeManager, stateManager, conf, eventPublisher);
autoOpenPipeline = autoOpen;
}
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineManager.java
index 2df851d..491e289 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineManager.java
@@ -383,10 +383,12 @@ public class TestSCMPipelineManager {
OZONE_SCM_PIPELINE_ALLOCATED_TIMEOUT, -1,
TimeUnit.MILLISECONDS);
+ EventQueue eventQueue = new EventQueue();
final SCMPipelineManager pipelineManager =
- new SCMPipelineManager(conf, nodeManager, new EventQueue(), null);
+ new SCMPipelineManager(conf, nodeManager, eventQueue);
final PipelineProvider ratisProvider = new MockRatisPipelineProvider(
- nodeManager, pipelineManager.getStateManager(), conf, false);
+ nodeManager, pipelineManager.getStateManager(), conf, eventQueue,
+ false);
pipelineManager.setPipelineProvider(HddsProtos.ReplicationType.RATIS,
ratisProvider);
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org