From d2b03e05c020289e3043af98f53b7608dec544c6 Mon Sep 17 00:00:00 2001 From: Minjae Gwon Date: Mon, 27 Nov 2023 22:58:02 +0900 Subject: [PATCH] test: ignore me --- rpc/src/main/scala/WorkerServer.scala | 11 +++++++++-- rpc/src/main/scala/WorkerService.scala | 2 ++ worker/src/main/scala/Worker.scala | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/rpc/src/main/scala/WorkerServer.scala b/rpc/src/main/scala/WorkerServer.scala index a574903..bc813b7 100644 --- 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 index a0745f4..b5e1098 100644 --- 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 index c63e52d..bce7135 100644 --- 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