test: ignore me

betarixm · Nov 27, 2023 · d2b03e0 · d2b03e0
1 parent bd064ea
commit d2b03e0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/rpc/src/main/scala/WorkerServer.scala b/rpc/src/main/scala/WorkerServer.scala
@@ -5,11 +5,13 @@ import org.apache.logging.log4j.scala.Logging
 
 import scala.concurrent.ExecutionContext
 import scala.reflect.io.Directory
-
 import worker._
 
+import kr.ac.postech.paranode.core.WorkerMetadata
+
 class WorkerServer(
     executionContext: ExecutionContext,
+    me: WorkerMetadata,
     port: Int,
     inputDirectories: Array[Directory],
     outputDirectory: Directory
@@ -18,7 +20,12 @@ class WorkerServer(
     .forPort(port)
     .addService(
       WorkerGrpc.bindService(
-        new WorkerService(executionContext, inputDirectories, outputDirectory),
+        new WorkerService(
+          executionContext,
+          me,
+          inputDirectories,
+          outputDirectory
+        ),
         executionContext
       )
     )

diff --git a/rpc/src/main/scala/WorkerService.scala b/rpc/src/main/scala/WorkerService.scala
@@ -35,6 +35,7 @@ import Implicit._
 
 class WorkerService(
     executionContext: ExecutionContext,
+    me: WorkerMetadata,
     inputDirectories: Array[Directory],
     outputDirectory: Directory
 ) extends WorkerGrpc.Worker
@@ -182,6 +183,7 @@ class WorkerService(
 
         val targetWorkers = workers
           .filter(_.keyRange.get.includes(block.records.head.key))
+          .filter(_.host != me.host)
           .toList
 
         logger.info(s"[WorkerServer] Sending $block to $targetWorkers")

diff --git a/worker/src/main/scala/Worker.scala b/worker/src/main/scala/Worker.scala
@@ -37,6 +37,7 @@ object Worker extends Logging {
 
     val server = new WorkerServer(
       executionContext,
+      workerMetadata,
       workerPort,
       workerArguments.inputDirectories,
       workerArguments.outputDirectory