[hadoop-ozone] 06/06: Rebase Fix

[sammichen]

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 03c93ecd7bdf66faae1ca63379abe41b4b6d06c4
Author: Sammi Chen <sammic...@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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: ozone-commits-h...@hadoop.apache.org