Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(retry backoff): Adding retry with backoff #6

Merged
merged 3 commits into from
Sep 14, 2024
Merged

feat(retry backoff): Adding retry with backoff #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1db8c25
feat(retry backoff): Adding retry with backoff
thoven87 Sep 13, 2024
e0553c9
dropped retry func
thoven87 Sep 13, 2024
ff6616e
use main branch
thoven87 Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Sources/JobsRedis/RedisJobQueue.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,15 @@ public final class RedisJobQueue: JobQueueDriver {
/// - Returns: Queued job
@discardableResult public func push(_ buffer: ByteBuffer, options: JobOptions) async throws -> JobID {
let jobInstanceID = JobID(delayUntil: options.delayUntil)

try await self.set(jobId: jobInstanceID, buffer: buffer)

_ = try await self.redisConnectionPool.wrappedValue.lpush(jobInstanceID.redisKey, into: self.configuration.queueKey).get()
try await self.addToQueue(jobInstanceID, buffer: buffer)
return jobInstanceID
}

private func addToQueue(_ jobId: JobID, buffer: ByteBuffer) async throws {
try await self.set(jobId: jobId, buffer: buffer)
_ = try await self.redisConnectionPool.wrappedValue.lpush(jobId.redisKey, into: self.configuration.queueKey).get()
}

/// Flag job is done
///
/// Removes job id from processing queue
Expand Down
41 changes: 40 additions & 1 deletion Tests/JobsRedisTests/RedisJobsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,12 @@ final class RedisJobsTests: XCTestCase {
)
),
numWorkers: numWorkers,
logger: logger
logger: logger,
options: .init(
maximumBackoff: 0.01,
maxJitter: 0.01,
minJitter: 0.0
)
)

return try await withThrowingTaskGroup(of: Void.self) { group in
Expand Down Expand Up @@ -176,6 +181,40 @@ final class RedisJobsTests: XCTestCase {
}
}

func testErrorRetryAndThenSucceed() async throws {
let jobIdentifer = JobIdentifier<Int>(#function)
let expectation = XCTestExpectation(description: "TestJob.execute was called", expectedFulfillmentCount: 2)
let currentJobTryCount: NIOLockedValueBox<Int> = .init(0)
struct FailedError: Error {}
try await self.testJobQueue(numWorkers: 1) { jobQueue in
jobQueue.registerJob(id: jobIdentifer, maxRetryCount: 3) { _, _ in
defer {
currentJobTryCount.withLockedValue {
$0 += 1
}
}
expectation.fulfill()
if currentJobTryCount.withLockedValue({ $0 }) == 0 {
throw FailedError()
}
}
try await jobQueue.push(id: jobIdentifer, parameters: 0)

await self.fulfillment(of: [expectation], timeout: 5)
try await Task.sleep(for: .milliseconds(200))

let failedJobs = try await jobQueue.queue.redisConnectionPool.wrappedValue.llen(of: jobQueue.queue.configuration.failedQueueKey).get()
XCTAssertEqual(failedJobs, 0)

let pendingJobs = try await jobQueue.queue.redisConnectionPool.wrappedValue.llen(of: jobQueue.queue.configuration.queueKey).get()
XCTAssertEqual(pendingJobs, 0)

let processingJobs = try await jobQueue.queue.redisConnectionPool.wrappedValue.llen(of: jobQueue.queue.configuration.processingQueueKey).get()
XCTAssertEqual(processingJobs, 0)
}
XCTAssertEqual(currentJobTryCount.withLockedValue { $0 }, 2)
}

func testJobSerialization() async throws {
struct TestJobParameters: Codable {
let id: Int
Expand Down