diff --git a/Sources/BalancingBucketQueue/BalancingBucketQueueImpl.swift b/Sources/BalancingBucketQueue/BalancingBucketQueueImpl.swift index 6629194a..74795b5b 100644 --- a/Sources/BalancingBucketQueue/BalancingBucketQueueImpl.swift +++ b/Sources/BalancingBucketQueue/BalancingBucketQueueImpl.swift @@ -118,8 +118,6 @@ final class BalancingBucketQueueImpl: BalancingBucketQueue { switch dequeueResult { case .dequeuedBucket: return dequeueResult - case .workerIsBlocked: - return .workerIsBlocked case .workerIsNotAlive: return .workerIsNotAlive case .queueIsEmpty, .checkAgainLater: diff --git a/Sources/BucketQueue/BucketQueueImpl.swift b/Sources/BucketQueue/BucketQueueImpl.swift index 6880f86f..07d0b93f 100644 --- a/Sources/BucketQueue/BucketQueueImpl.swift +++ b/Sources/BucketQueue/BucketQueueImpl.swift @@ -69,8 +69,6 @@ final class BucketQueueImpl: BucketQueue { public func dequeueBucket(requestId: RequestId, workerId: WorkerId) -> DequeueResult { switch workerAlivenessProvider.alivenessForWorker(workerId: workerId).status { - case .blocked: - return .workerIsBlocked case .silent, .notRegistered: return .workerIsNotAlive case .alive: @@ -179,8 +177,6 @@ final class BucketQueueImpl: BucketQueue { return nil } stuckReason = .bucketLost - case .blocked: - stuckReason = .workerIsBlocked case .silent(let lastAlivenessResponseTimestamp): stuckReason = .workerIsSilent(since: lastAlivenessResponseTimestamp) } diff --git a/Sources/BucketQueue/DequeuedBucket.swift b/Sources/BucketQueue/DequeuedBucket.swift index 5b1ca256..f083c73c 100644 --- a/Sources/BucketQueue/DequeuedBucket.swift +++ b/Sources/BucketQueue/DequeuedBucket.swift @@ -5,7 +5,6 @@ public enum DequeueResult: Hashable { case queueIsEmpty case checkAgainLater(checkAfter: TimeInterval) case dequeuedBucket(DequeuedBucket) - case workerIsBlocked case workerIsNotAlive } diff --git a/Sources/BucketQueue/StuckBucket.swift b/Sources/BucketQueue/StuckBucket.swift index aaa1f383..9eace518 100644 --- a/Sources/BucketQueue/StuckBucket.swift +++ b/Sources/BucketQueue/StuckBucket.swift @@ -5,7 +5,6 @@ import QueueModels public struct StuckBucket: Equatable { public enum Reason: Equatable, CustomStringConvertible { - case workerIsBlocked case workerIsSilent(since: Date) case bucketLost @@ -14,8 +13,6 @@ public struct StuckBucket: Equatable { case .workerIsSilent(let since): let formatted = NSLogLikeLogEntryTextFormatter.logDateFormatter.string(from: since) return "worker is silent since \(formatted)" - case .workerIsBlocked: - return "worker is blocked" case .bucketLost: return "worker has been processing bucket but then switched to another bucket" } diff --git a/Sources/DistWorker/DistWorker.swift b/Sources/DistWorker/DistWorker.swift index 16d91658..86eb4c36 100644 --- a/Sources/DistWorker/DistWorker.swift +++ b/Sources/DistWorker/DistWorker.swift @@ -169,9 +169,6 @@ public final class DistWorker: SchedulerDelegate { case .queueIsEmpty: Logger.debug("Server returned that queue is empty") return .result(nil) - case .workerHasBeenBlocked: - Logger.error("Server has blocked this worker") - return .result(nil) case .workerConsideredNotAlive: Logger.error("Server considers this worker as not alive") return .result(nil) diff --git a/Sources/QueueClient/QueueClient.swift b/Sources/QueueClient/QueueClient.swift index 5ac21d45..e46792c6 100644 --- a/Sources/QueueClient/QueueClient.swift +++ b/Sources/QueueClient/QueueClient.swift @@ -158,8 +158,6 @@ public final class QueueClient { delegate?.queueClientQueueIsEmpty(self) case .workerIsNotAlive: delegate?.queueClientWorkerConsideredNotAlive(self) - case .workerIsBlocked: - delegate?.queueClientWorkerHasBeenBlocked(self) } } diff --git a/Sources/QueueClient/QueueClientDelegate.swift b/Sources/QueueClient/QueueClientDelegate.swift index 52c9a338..3bd28d4f 100644 --- a/Sources/QueueClient/QueueClientDelegate.swift +++ b/Sources/QueueClient/QueueClientDelegate.swift @@ -6,7 +6,6 @@ public protocol QueueClientDelegate: class { func queueClient(_ sender: QueueClient, didFailWithError error: QueueClientError) func queueClientQueueIsEmpty(_ sender: QueueClient) func queueClientWorkerConsideredNotAlive(_ sender: QueueClient) - func queueClientWorkerHasBeenBlocked(_ sender: QueueClient) func queueClient(_ sender: QueueClient, fetchBucketLaterAfter after: TimeInterval) func queueClient(_ sender: QueueClient, didFetchBucket bucket: Bucket) func queueClientDidScheduleTests(_ sender: QueueClient, requestId: RequestId) diff --git a/Sources/QueueClient/SynchronousQueueClient.swift b/Sources/QueueClient/SynchronousQueueClient.swift index 694498a4..bf3809a9 100644 --- a/Sources/QueueClient/SynchronousQueueClient.swift +++ b/Sources/QueueClient/SynchronousQueueClient.swift @@ -13,7 +13,6 @@ public final class SynchronousQueueClient: QueueClientDelegate { case bucket(Bucket) case queueIsEmpty case checkLater(TimeInterval) - case workerHasBeenBlocked case workerConsideredNotAlive } @@ -160,10 +159,6 @@ public final class SynchronousQueueClient: QueueClientDelegate { bucketFetchResult = Either.success(.workerConsideredNotAlive) } - public func queueClientWorkerHasBeenBlocked(_ sender: QueueClient) { - bucketFetchResult = Either.success(.workerHasBeenBlocked) - } - public func queueClient(_ sender: QueueClient, fetchBucketLaterAfter after: TimeInterval) { bucketFetchResult = Either.success(.checkLater(after)) } diff --git a/Sources/QueueServer/Endpoints/BucketProviderEndpoint.swift b/Sources/QueueServer/Endpoints/BucketProviderEndpoint.swift index bbee0e48..8a845418 100644 --- a/Sources/QueueServer/Endpoints/BucketProviderEndpoint.swift +++ b/Sources/QueueServer/Endpoints/BucketProviderEndpoint.swift @@ -38,8 +38,6 @@ public final class BucketProviderEndpoint: PayloadSignatureVerifyingRESTEndpoint return .bucketDequeued(bucket: dequeuedBucket.enqueuedBucket.bucket) case .workerIsNotAlive: return .workerIsNotAlive - case .workerIsBlocked: - return .workerIsBlocked } } } diff --git a/Sources/QueueServer/Endpoints/BucketResultRegistrar.swift b/Sources/QueueServer/Endpoints/BucketResultRegistrar.swift index 0c9df93f..0b603c11 100644 --- a/Sources/QueueServer/Endpoints/BucketResultRegistrar.swift +++ b/Sources/QueueServer/Endpoints/BucketResultRegistrar.swift @@ -24,16 +24,11 @@ public final class BucketResultRegistrar: PayloadSignatureVerifyingRESTEndpoint } public func handle(verifiedPayload: BucketResultPayload) throws -> BucketResultAcceptResponse { - do { - let acceptResult = try bucketResultAccepter.accept( - testingResult: verifiedPayload.testingResult, - requestId: verifiedPayload.requestId, - workerId: verifiedPayload.workerId - ) - return .bucketResultAccepted(bucketId: acceptResult.dequeuedBucket.enqueuedBucket.bucket.bucketId) - } catch { - workerAlivenessProvider.blockWorker(workerId: verifiedPayload.workerId) - throw error - } + let acceptResult = try bucketResultAccepter.accept( + testingResult: verifiedPayload.testingResult, + requestId: verifiedPayload.requestId, + workerId: verifiedPayload.workerId + ) + return .bucketResultAccepted(bucketId: acceptResult.dequeuedBucket.enqueuedBucket.bucket.bucketId) } } diff --git a/Sources/QueueServer/Endpoints/WorkerRegistrar.swift b/Sources/QueueServer/Endpoints/WorkerRegistrar.swift index 2e52390f..c64d3e69 100644 --- a/Sources/QueueServer/Endpoints/WorkerRegistrar.swift +++ b/Sources/QueueServer/Endpoints/WorkerRegistrar.swift @@ -14,15 +14,12 @@ public final class WorkerRegistrar: RESTEndpoint { public enum WorkerRegistrarError: Swift.Error, CustomStringConvertible { case missingWorkerConfiguration(workerId: WorkerId) - case workerIsBlocked(workerId: WorkerId) case workerIsAlreadyRegistered(workerId: WorkerId) public var description: String { switch self { case .missingWorkerConfiguration(let workerId): return "Missing worker configuration for \(workerId)" - case .workerIsBlocked(let workerId): - return "Can't register \(workerId) because it has been blocked" case .workerIsAlreadyRegistered(let workerId): return "Can't register \(workerId) because it is already registered" } @@ -57,8 +54,6 @@ public final class WorkerRegistrar: RESTEndpoint { return .workerRegisterSuccess(workerConfiguration: workerConfiguration) case .alive: throw WorkerRegistrarError.workerIsAlreadyRegistered(workerId: decodedPayload.workerId) - case .blocked: - throw WorkerRegistrarError.workerIsBlocked(workerId: decodedPayload.workerId) } } } diff --git a/Sources/QueueServer/StuckBucketsPoller.swift b/Sources/QueueServer/StuckBucketsPoller.swift index a606e44b..3e5723cf 100644 --- a/Sources/QueueServer/StuckBucketsPoller.swift +++ b/Sources/QueueServer/StuckBucketsPoller.swift @@ -51,7 +51,6 @@ private extension StuckBucket.Reason { var metricParameterName: String { switch self { case .workerIsSilent: return "workerIsSilent" - case .workerIsBlocked: return "workerIsBlocked" case .bucketLost: return "bucketLost" } } diff --git a/Sources/QueueServer/WorkerAlivenessMatricCapturer.swift b/Sources/QueueServer/WorkerAlivenessMatricCapturer.swift index 3ec52b1f..0efea891 100644 --- a/Sources/QueueServer/WorkerAlivenessMatricCapturer.swift +++ b/Sources/QueueServer/WorkerAlivenessMatricCapturer.swift @@ -46,7 +46,6 @@ private extension WorkerAliveness.Status { var metricComponentName: String { switch self { case .alive: return "alive" - case .blocked: return "blocked" case .notRegistered: return "notRegistered" case .silent: return "silent" } diff --git a/Sources/RESTMethods/DequeueBucket/DequeueBucketResponse.swift b/Sources/RESTMethods/DequeueBucket/DequeueBucketResponse.swift index 67ece898..c8230205 100644 --- a/Sources/RESTMethods/DequeueBucket/DequeueBucketResponse.swift +++ b/Sources/RESTMethods/DequeueBucket/DequeueBucketResponse.swift @@ -5,7 +5,6 @@ public enum DequeueBucketResponse: Codable, Equatable { case bucketDequeued(bucket: Bucket) case queueIsEmpty case workerIsNotAlive - case workerIsBlocked case checkAgainLater(checkAfter: TimeInterval) private enum CodingKeys: CodingKey { @@ -18,7 +17,6 @@ public enum DequeueBucketResponse: Codable, Equatable { case bucketDequeued case queueIsEmpty case workerIsNotAlive - case workerIsBlocked case checkAgainLater } @@ -34,8 +32,6 @@ public enum DequeueBucketResponse: Codable, Equatable { self = .workerIsNotAlive case .checkAgainLater: self = .checkAgainLater(checkAfter: try container.decode(TimeInterval.self, forKey: .checkAfter)) - case .workerIsBlocked: - self = .workerIsBlocked } } @@ -52,8 +48,6 @@ public enum DequeueBucketResponse: Codable, Equatable { try container.encode(CaseId.queueIsEmpty, forKey: .caseId) case .workerIsNotAlive: try container.encode(CaseId.workerIsNotAlive, forKey: .caseId) - case .workerIsBlocked: - try container.encode(CaseId.workerIsBlocked, forKey: .caseId) } } } diff --git a/Sources/WorkerAlivenessProvider/WorkerAliveness.swift b/Sources/WorkerAlivenessProvider/WorkerAliveness.swift index 096b1261..935a0193 100644 --- a/Sources/WorkerAlivenessProvider/WorkerAliveness.swift +++ b/Sources/WorkerAlivenessProvider/WorkerAliveness.swift @@ -5,7 +5,6 @@ public struct WorkerAliveness: Equatable, CustomStringConvertible { public enum Status: Equatable, CustomStringConvertible { case alive case silent(lastAlivenessResponseTimestamp: Date) - case blocked case notRegistered public var description: String { @@ -14,8 +13,6 @@ public struct WorkerAliveness: Equatable, CustomStringConvertible { return "alive" case .silent(let lastAlivenessResponseTimestamp): return "silent since \(lastAlivenessResponseTimestamp)" - case .blocked: - return "blocked" case .notRegistered: return "not registered" } diff --git a/Sources/WorkerAlivenessProvider/WorkerAlivenessProvider.swift b/Sources/WorkerAlivenessProvider/WorkerAlivenessProvider.swift index b72d3f8c..3d21f9cd 100644 --- a/Sources/WorkerAlivenessProvider/WorkerAlivenessProvider.swift +++ b/Sources/WorkerAlivenessProvider/WorkerAlivenessProvider.swift @@ -11,7 +11,6 @@ public protocol WorkerAlivenessProvider: class { func didDequeueBucket(bucketId: BucketId, workerId: WorkerId) func didRegisterWorker(workerId: WorkerId) - func blockWorker(workerId: WorkerId) } public extension WorkerAlivenessProvider { diff --git a/Sources/WorkerAlivenessProvider/WorkerAlivenessProviderImpl.swift b/Sources/WorkerAlivenessProvider/WorkerAlivenessProviderImpl.swift index 2e68e194..26ab735d 100644 --- a/Sources/WorkerAlivenessProvider/WorkerAlivenessProviderImpl.swift +++ b/Sources/WorkerAlivenessProvider/WorkerAlivenessProviderImpl.swift @@ -11,7 +11,6 @@ public final class WorkerAlivenessProviderImpl: WorkerAlivenessProvider { private let knownWorkerIds: Set private var workerAliveReportTimestamps = [WorkerId: Date]() private let workerBucketIdsBeingProcessed = WorkerCurrentlyProcessingBucketsTracker() - private var blockedWorkers = Set() /// allow worker some additinal time to perform a "i'm alive" report, e.g. to compensate a network latency private let maximumNotReportingDuration: TimeInterval @@ -34,10 +33,8 @@ public final class WorkerAlivenessProviderImpl: WorkerAlivenessProvider { public func set(bucketIdsBeingProcessed: Set, workerId: WorkerId) { syncQueue.sync { - if !blockedWorkers.contains(workerId) { - onSyncQueue_markWorkerAsAlive(workerId: workerId) - workerBucketIdsBeingProcessed.set(bucketIdsBeingProcessed: bucketIdsBeingProcessed, byWorkerId: workerId) - } + onSyncQueue_markWorkerAsAlive(workerId: workerId) + workerBucketIdsBeingProcessed.set(bucketIdsBeingProcessed: bucketIdsBeingProcessed, byWorkerId: workerId) } } @@ -46,18 +43,7 @@ public final class WorkerAlivenessProviderImpl: WorkerAlivenessProvider { onSyncQueue_markWorkerAsAlive(workerId: workerId) } } - - public func blockWorker(workerId: WorkerId) { - syncQueue.sync { - _ = blockedWorkers.insert(workerId) - workerBucketIdsBeingProcessed.resetBucketIdsBeingProcessedBy(workerId: workerId) - Logger.warning("Blocked worker: \(workerId)") - - let workerAliveness = onSyncQueue_workerAliveness() - Logger.debug("Alive workers: \(workerAliveness.filter { $0.value.status == .alive }), blocked workers: \(workerAliveness.filter { $0.value.status == .blocked })") - } - } - + public var workerAliveness: [WorkerId: WorkerAliveness] { return syncQueue.sync { onSyncQueue_workerAliveness() @@ -71,7 +57,7 @@ public final class WorkerAlivenessProviderImpl: WorkerAlivenessProvider { } private func onSyncQueue_workerAliveness() -> [WorkerId: WorkerAliveness] { - let uniqueWorkerIds = Set(workerAliveReportTimestamps.keys).union(blockedWorkers).union(knownWorkerIds) + let uniqueWorkerIds = Set(workerAliveReportTimestamps.keys).union(knownWorkerIds) var workerAliveness = [WorkerId: WorkerAliveness]() let currentDate = Date() @@ -85,9 +71,6 @@ public final class WorkerAlivenessProviderImpl: WorkerAlivenessProvider { guard let latestAliveDate = workerAliveReportTimestamps[workerId] else { return WorkerAliveness(status: .notRegistered, bucketIdsBeingProcessed: []) } - if blockedWorkers.contains(workerId) { - return WorkerAliveness(status: .blocked, bucketIdsBeingProcessed: []) - } let bucketIdsBeingProcessed = workerBucketIdsBeingProcessed.bucketIdsBeingProcessedBy(workerId: workerId) let silenceDuration = currentDate.timeIntervalSince(latestAliveDate) diff --git a/Tests/BalancingBucketQueueTests/BalancingBucketQueueTests.swift b/Tests/BalancingBucketQueueTests/BalancingBucketQueueTests.swift index 4b2b4219..7d6f8c3b 100644 --- a/Tests/BalancingBucketQueueTests/BalancingBucketQueueTests.swift +++ b/Tests/BalancingBucketQueueTests/BalancingBucketQueueTests.swift @@ -392,21 +392,6 @@ final class BalancingBucketQueueTests: XCTestCase { ) } - func test___dequeueing_by_blocked_worker___when_buckets_enqueued___provides_blocked_response() throws { - workerAlivenessProvider.workerAliveness[workerId] = WorkerAliveness( - status: .blocked, - bucketIdsBeingProcessed: [] - ) - - let bucket = BucketFixtures.createBucket(testEntries: [TestEntryFixtures.testEntry()]) - balancingQueue.enqueue(buckets: [bucket], prioritizedJob: prioritizedJob) - - XCTAssertEqual( - balancingQueue.dequeueBucket(requestId: requestId, workerId: workerId), - DequeueResult.workerIsBlocked - ) - } - let dateProvider = DateProviderFixture() let uniqueIdentifierGenerator = FixedValueUniqueIdentifierGenerator() let workerAlivenessProvider = MutableWorkerAlivenessProvider() diff --git a/Tests/BucketQueueTests/BucketQueueTests.swift b/Tests/BucketQueueTests/BucketQueueTests.swift index bfafccbb..c7113409 100644 --- a/Tests/BucketQueueTests/BucketQueueTests.swift +++ b/Tests/BucketQueueTests/BucketQueueTests.swift @@ -113,18 +113,7 @@ final class BucketQueueTests: XCTestCase { XCTFail("Expected dequeueResult == .checkAgainLater, got: \(dequeueResult)") } } - - func test__reponse_workerBlocked__when_worker_is_blocked() { - alivenessTrackerWithAlwaysAliveResults.blockWorker(workerId: workerId) - let bucketQueue = BucketQueueFixtures.bucketQueue(workerAlivenessProvider: alivenessTrackerWithAlwaysAliveResults) - - let bucket = BucketFixtures.createBucket(testEntries: []) - bucketQueue.enqueue(buckets: [bucket]) - let dequeueResult = bucketQueue.dequeueBucket(requestId: requestId, workerId: workerId) - XCTAssertEqual(dequeueResult, .workerIsBlocked) - } - func test__reponse_workerIsNotAlive__when_worker_is_not_alive() { let bucketQueue = BucketQueueFixtures.bucketQueue(workerAlivenessProvider: alivenessTrackerWithAlwaysAliveResults) let dequeueResult = bucketQueue.dequeueBucket( @@ -230,22 +219,7 @@ final class BucketQueueTests: XCTestCase { [StuckBucket(reason: .workerIsSilent(since: silentSince), bucket: bucket, workerId: workerId, requestId: requestId)] ) } - - func test__when_worker_is_blocked__its_dequeued_buckets_removed() { - let bucket = BucketFixtures.createBucket(testEntries: []) - let bucketQueue = BucketQueueFixtures.bucketQueue(workerAlivenessProvider: alivenessTrackerWithAlwaysAliveResults) - bucketQueue.enqueue(buckets: [bucket]) - _ = bucketQueue.dequeueBucket(requestId: requestId, workerId: workerId) - - alivenessTrackerWithAlwaysAliveResults.blockWorker(workerId: workerId) - let stuckBuckets = bucketQueue.reenqueueStuckBuckets() - XCTAssertEqual( - stuckBuckets, - [StuckBucket(reason: .workerIsBlocked, bucket: bucket, workerId: workerId, requestId: requestId)] - ) - } - func test___when_worker_loses_bucket___it_is_removed_as_stuck() { let bucket = BucketFixtures.createBucket(testEntries: []) diff --git a/Tests/QueueClientTests/FakeQueueClientDelegate.swift b/Tests/QueueClientTests/FakeQueueClientDelegate.swift index 67c83bf1..bca8ffde 100644 --- a/Tests/QueueClientTests/FakeQueueClientDelegate.swift +++ b/Tests/QueueClientTests/FakeQueueClientDelegate.swift @@ -10,7 +10,6 @@ class FakeQueueClientDelegate: QueueClientDelegate { case queueIsEmpty case checkAfter(TimeInterval) case bucket(Bucket) - case workerHasBeenBlocked case workerConsideredNotAlive case didScheduleTests(RequestId) case fetchedJobState(JobState) @@ -32,10 +31,6 @@ class FakeQueueClientDelegate: QueueClientDelegate { responses.append(ServerResponse.workerConsideredNotAlive) } - func queueClientWorkerHasBeenBlocked(_ sender: QueueClient) { - responses.append(ServerResponse.workerHasBeenBlocked) - } - func queueClient(_ sender: QueueClient, fetchBucketLaterAfter after: TimeInterval) { responses.append(ServerResponse.checkAfter(after)) } diff --git a/Tests/QueueServerTests/WorkerRegistrarTests.swift b/Tests/QueueServerTests/WorkerRegistrarTests.swift index c43cdd08..c1d7052b 100644 --- a/Tests/QueueServerTests/WorkerRegistrarTests.swift +++ b/Tests/QueueServerTests/WorkerRegistrarTests.swift @@ -43,21 +43,6 @@ final class WorkerRegistrarTests: XCTestCase { XCTAssertEqual(alivenessTracker.alivenessForWorker(workerId: workerId).status, .alive) } - func test___registration_for_blocked_worker__throws() throws { - let registrar = createRegistrar() - alivenessTracker.didRegisterWorker(workerId: workerId) - alivenessTracker.blockWorker(workerId: workerId) - - assertThrows { - _ = try registrar.handle( - decodedPayload: RegisterWorkerPayload( - workerId: workerId, - workerRestAddress: SocketAddress(host: "host", port: 0) - ) - ) - } - } - func test_successful_registration() throws { let registrar = createRegistrar() diff --git a/Tests/WorkerAlivenessProviderTestHelpers/MutableWorkerAlivenessProvider.swift b/Tests/WorkerAlivenessProviderTestHelpers/MutableWorkerAlivenessProvider.swift index 9e421579..e2d34c7c 100644 --- a/Tests/WorkerAlivenessProviderTestHelpers/MutableWorkerAlivenessProvider.swift +++ b/Tests/WorkerAlivenessProviderTestHelpers/MutableWorkerAlivenessProvider.swift @@ -17,11 +17,7 @@ public final class MutableWorkerAlivenessProvider: WorkerAlivenessProvider { bucketIdByWorkerId.append(key: workerId, element: bucketId) workerAliveness[workerId] = WorkerAliveness(status: .alive, bucketIdsBeingProcessed: Set(bucketIdByWorkerId[workerId])) } - - public func blockWorker(workerId: WorkerId) { - workerAliveness[workerId] = WorkerAliveness(status: .blocked, bucketIdsBeingProcessed: []) - } - + public func didRegisterWorker(workerId: WorkerId) { bucketIdByWorkerId[workerId] = [] workerAliveness[workerId] = WorkerAliveness(status: .alive, bucketIdsBeingProcessed: []) diff --git a/Tests/WorkerAlivenessProviderTests/WorkerAlivenessProviderTests.swift b/Tests/WorkerAlivenessProviderTests/WorkerAlivenessProviderTests.swift index d86fdb12..069e0c3b 100644 --- a/Tests/WorkerAlivenessProviderTests/WorkerAlivenessProviderTests.swift +++ b/Tests/WorkerAlivenessProviderTests/WorkerAlivenessProviderTests.swift @@ -43,34 +43,12 @@ final class WorkerAlivenessProviderTests: XCTestCase { XCTAssertEqual(tracker.alivenessForWorker(workerId: "worker").bucketIdsBeingProcessed, ["bucketid"]) } - func test__blocked_workers() { - let tracker = WorkerAlivenessProviderFixtures.alivenessTrackerWithAlwaysAliveResults() - tracker.didRegisterWorker(workerId: "worker") - tracker.blockWorker(workerId: "worker") - XCTAssertEqual(tracker.alivenessForWorker(workerId: "worker").status, .blocked) - } - - func test___if_worker_blocked___aliveness_does_not_include_buckets_being_processed() { - let tracker = WorkerAlivenessProviderFixtures.alivenessTrackerWithAlwaysAliveResults() - tracker.didRegisterWorker(workerId: "worker") - tracker.set(bucketIdsBeingProcessed: ["bucketid"], workerId: "worker") - tracker.blockWorker(workerId: "worker") - XCTAssertEqual(tracker.alivenessForWorker(workerId: "worker").bucketIdsBeingProcessed, []) - } - func test__availability_of_workers() { let tracker = WorkerAlivenessProviderFixtures.alivenessTrackerWithAlwaysAliveResults() tracker.didRegisterWorker(workerId: "worker") XCTAssertTrue(tracker.hasAnyAliveWorker) } - func test__availability_of_workers__after_blocking_last_worker() { - let tracker = WorkerAlivenessProviderFixtures.alivenessTrackerWithAlwaysAliveResults() - tracker.didRegisterWorker(workerId: "worker") - tracker.blockWorker(workerId: "worker") - XCTAssertFalse(tracker.hasAnyAliveWorker) - } - func test___aliveness_for_not_registered_workers() { let tracker = WorkerAlivenessProviderFixtures.alivenessTrackerWithAlwaysAliveResults( knownWorkerIds: [WorkerId(value: "worker")]