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.

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

Fix a race condition when handling many concurrent responses #355

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
18 changes: 7 additions & 11 deletions Sources/MongoClient/ConnectionContext.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ internal struct MongoResponseContext {
}

public final class MongoClientContext {
private var queries = [MongoResponseContext]()
private var queries = [Int32: MongoResponseContext]()
internal var serverHandshake: ServerHandshake? {
didSet {
if let version = serverHandshake?.maxWireVersion, version.isDeprecated {
Expand All @@ -20,40 +20,36 @@ public final class MongoClientContext {
let logger: Logger

internal func handleReply(_ reply: MongoServerReply) -> Bool {
guard let index = queries.firstIndex(where: { $0.requestId == reply.responseTo }) else {
guard let query = queries.removeValue(forKey: reply.responseTo) else {
return false
}

let query = queries[index]
queries.remove(at: index)
query.result.succeed(reply)
return true
}

internal func awaitReply(toRequestId requestId: Int32, completing result: EventLoopPromise<MongoServerReply>) {
queries.append(MongoResponseContext(requestId: requestId, result: result))
queries[requestId] = MongoResponseContext(requestId: requestId, result: result)
}

deinit {
self.cancelQueries(MongoError(.queryFailure, reason: .connectionClosed))
}

public func failQuery(byRequestId requestId: Int32, error: Error) {
guard let index = queries.firstIndex(where: { $0.requestId == requestId }) else {
guard let query = queries.removeValue(forKey: requestId) else {
return
}

let query = queries[index]
queries.remove(at: index)

query.result.fail(error)
}

public func cancelQueries(_ error: Error) {
for query in queries {
for query in queries.values {
query.result.fail(error)
}

queries = []
queries = [:]
}

public init(logger: Logger) {
Expand Down
Loading