From dcc0a0f8be30ca7ae329d6737ac64d391024c220 Mon Sep 17 00:00:00 2001 From: Stefana Dranca Date: Mon, 18 Mar 2024 17:36:28 +0000 Subject: [PATCH 1/4] Implement 'quit' and 'core count' RPCs on the worker service Motivation: These are 2 of the RPCs on the worker service that we need for benchmarking. Modifications: - Created the WorkerService struct that has a GRPCClient and a GRPCServer property - Implemented the 'coreCount' and 'quitWorker' RPCs Result: - The driver will be able to request 'quitWorker' and 'coreCount' from the workers --- .../performance-worker/WorkerService.swift | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 Sources/performance-worker/WorkerService.swift diff --git a/Sources/performance-worker/WorkerService.swift b/Sources/performance-worker/WorkerService.swift new file mode 100644 index 000000000..89a1be26c --- /dev/null +++ b/Sources/performance-worker/WorkerService.swift @@ -0,0 +1,62 @@ +/* + * Copyright 2024, gRPC Authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import GRPCCore +import NIOCore + +@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *) +struct WorkerService: Grpc_Testing_WorkerService.ServiceProtocol { + var testClient: GRPCClient? = nil + var testServer: GRPCServer? = nil + + func quitWorker( + request: ServerRequest.Single + ) async throws -> ServerResponse.Single { + if let testClient = self.testClient { + testClient?.close() + } else if let testServer = self.testServer { + testServer.stopListening() + } + return ServerResponse.Single(Grpc_Testing_WorkerService.Method.QuitWorker.Output()) + } + + func coreCount( + request: ServerRequest.Single + ) async throws -> ServerResponse.Single { + let coreCount = System.coreCount + return ServerResponse.Single( + Grpc_Testing_WorkerService.Method.CoreCount.Output.with { + $0.cores = coreCount + } + ) + } + + func runServer( + request: GRPCCore.ServerRequest.Stream + ) async throws + -> GRPCCore.ServerResponse.Stream + { + throw RPCError(status: .Code(.unimplemented)) + } + + func runClient( + request: GRPCCore.ServerRequest.Stream + ) async throws + -> GRPCCore.ServerResponse.Stream + { + throw RPCError(status: .Code(.unimplemented)) + } +} From 36f7c88935383ae80fcedec72567ad0b75e82743 Mon Sep 17 00:00:00 2001 From: Stefana Dranca Date: Mon, 18 Mar 2024 17:50:52 +0000 Subject: [PATCH 2/4] added dependency and fixed errors --- Package.swift | 3 ++- Sources/performance-worker/WorkerService.swift | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Package.swift b/Package.swift index e6b4fb0bb..83d52b749 100644 --- a/Package.swift +++ b/Package.swift @@ -250,7 +250,8 @@ extension Target { name: "performance-worker", dependencies: [ .grpcCore, - .grpcProtobuf + .grpcProtobuf, + .nioCore ] ) diff --git a/Sources/performance-worker/WorkerService.swift b/Sources/performance-worker/WorkerService.swift index 89a1be26c..c1710c266 100644 --- a/Sources/performance-worker/WorkerService.swift +++ b/Sources/performance-worker/WorkerService.swift @@ -26,11 +26,11 @@ struct WorkerService: Grpc_Testing_WorkerService.ServiceProtocol { request: ServerRequest.Single ) async throws -> ServerResponse.Single { if let testClient = self.testClient { - testClient?.close() + testClient.close() } else if let testServer = self.testServer { testServer.stopListening() } - return ServerResponse.Single(Grpc_Testing_WorkerService.Method.QuitWorker.Output()) + return ServerResponse.Single(message: Grpc_Testing_WorkerService.Method.QuitWorker.Output()) } func coreCount( @@ -38,8 +38,8 @@ struct WorkerService: Grpc_Testing_WorkerService.ServiceProtocol { ) async throws -> ServerResponse.Single { let coreCount = System.coreCount return ServerResponse.Single( - Grpc_Testing_WorkerService.Method.CoreCount.Output.with { - $0.cores = coreCount + message: Grpc_Testing_WorkerService.Method.CoreCount.Output.with { + $0.cores = Int32(coreCount) } ) } @@ -49,7 +49,7 @@ struct WorkerService: Grpc_Testing_WorkerService.ServiceProtocol { ) async throws -> GRPCCore.ServerResponse.Stream { - throw RPCError(status: .Code(.unimplemented)) + throw RPCError(code: .unimplemented, message: "This RPC has not been implemented yet.") } func runClient( @@ -57,6 +57,6 @@ struct WorkerService: Grpc_Testing_WorkerService.ServiceProtocol { ) async throws -> GRPCCore.ServerResponse.Stream { - throw RPCError(status: .Code(.unimplemented)) + throw RPCError(code: .unimplemented, message: "This RPC has not been implemented yet.") } } From d2065f7a6f089b9351fdd5bb3dabf8519bce3f50 Mon Sep 17 00:00:00 2001 From: Stefana Dranca Date: Tue, 19 Mar 2024 11:26:15 +0000 Subject: [PATCH 3/4] added state to worker service and made it sendable --- .../performance-worker/WorkerService.swift | 48 ++++++++++++++++--- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/Sources/performance-worker/WorkerService.swift b/Sources/performance-worker/WorkerService.swift index c1710c266..88e566812 100644 --- a/Sources/performance-worker/WorkerService.swift +++ b/Sources/performance-worker/WorkerService.swift @@ -15,20 +15,54 @@ */ import GRPCCore +import NIOConcurrencyHelpers import NIOCore @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *) -struct WorkerService: Grpc_Testing_WorkerService.ServiceProtocol { - var testClient: GRPCClient? = nil - var testServer: GRPCServer? = nil +final class WorkerService: Grpc_Testing_WorkerService.ServiceProtocol, Sendable { + let state: NIOLockedValueBox + + init() { + let clientAndServer = State() + self.state = NIOLockedValueBox(clientAndServer) + } + + struct State { + var role: Role? + + enum Role { + case client(GRPCClient) + case server(GRPCServer) + } + + init() {} + + init(role: Role) { + self.role = role + } + + init(server: GRPCServer) { + self.role = .server(server) + } + + init(client: GRPCClient) { + self.role = .client(client) + } + } func quitWorker( request: ServerRequest.Single ) async throws -> ServerResponse.Single { - if let testClient = self.testClient { - testClient.close() - } else if let testServer = self.testServer { - testServer.stopListening() + + if let role = self.state.withLockedValue({ $0.role }) { + switch role { + case .client(let client): + client.close() + self.state.withLockedValue({ $0.role = nil }) + case .server(let server): + server.stopListening() + self.state.withLockedValue({ $0.role = nil }) + } } return ServerResponse.Single(message: Grpc_Testing_WorkerService.Method.QuitWorker.Output()) } From 26172a8fc3919fe951339052d2d5dbcad9be1271 Mon Sep 17 00:00:00 2001 From: Stefana Dranca Date: Tue, 19 Mar 2024 15:04:02 +0000 Subject: [PATCH 4/4] implemented feedback --- Sources/performance-worker/WorkerService.swift | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Sources/performance-worker/WorkerService.swift b/Sources/performance-worker/WorkerService.swift index 88e566812..b1d419c95 100644 --- a/Sources/performance-worker/WorkerService.swift +++ b/Sources/performance-worker/WorkerService.swift @@ -20,14 +20,14 @@ import NIOCore @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *) final class WorkerService: Grpc_Testing_WorkerService.ServiceProtocol, Sendable { - let state: NIOLockedValueBox + private let state: NIOLockedValueBox init() { let clientAndServer = State() self.state = NIOLockedValueBox(clientAndServer) } - struct State { + private struct State { var role: Role? enum Role { @@ -54,16 +54,20 @@ final class WorkerService: Grpc_Testing_WorkerService.ServiceProtocol, Sendable request: ServerRequest.Single ) async throws -> ServerResponse.Single { - if let role = self.state.withLockedValue({ $0.role }) { + let role = self.state.withLockedValue { state in + defer { state.role = nil } + return state.role + } + + if let role = role { switch role { case .client(let client): client.close() - self.state.withLockedValue({ $0.role = nil }) case .server(let server): server.stopListening() - self.state.withLockedValue({ $0.role = nil }) } } + return ServerResponse.Single(message: Grpc_Testing_WorkerService.Method.QuitWorker.Output()) }