Skip to content

Remove unneeded assertion #169

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

Merged
merged 5 commits into from
Feb 27, 2020
Merged
Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion Sources/AsyncHTTPClient/ConnectionPool.swift
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,6 @@ final class ConnectionPool {
assert(MultiThreadedEventLoopGroup.currentEventLoop == nil,
"HTTPClient shutdown on EventLoop unsupported") // calls .wait() so it would crash later anyway
let (waitersFutures, closeFutures) = self.stateLock.withLock { () -> ([EventLoopFuture<Connection>], [EventLoopFuture<Void>]) in
assert(self.state.activity == .opened, "Invalid activity: \(self.state.activity)")
// Fail waiters
let waitersCopy = self.state.waiters
self.state.waiters.removeAll()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ extension HTTPClientInternalTests {
("testChannelAndDelegateOnDifferentEventLoops", testChannelAndDelegateOnDifferentEventLoops),
("testResponseConnectionCloseGet", testResponseConnectionCloseGet),
("testWeNoticeRemoteClosuresEvenWhenConnectionIsIdleInPool", testWeNoticeRemoteClosuresEvenWhenConnectionIsIdleInPool),
("testWeTolerateConnectionsGoingAwayWhilstPoolIsShuttingDown", testWeTolerateConnectionsGoingAwayWhilstPoolIsShuttingDown),
]
}
}
42 changes: 42 additions & 0 deletions Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -581,4 +581,46 @@ class HTTPClientInternalTests: XCTestCase {
XCTAssertEqual(2, sharedStateServerHandler.connectionNumber.load())
XCTAssertEqual(2, sharedStateServerHandler.requestNumber.load())
}

func testWeTolerateConnectionsGoingAwayWhilstPoolIsShuttingDown() {
struct NoChannelError: Error {}

let client = HTTPClient(eventLoopGroupProvider: .createNew)
var maybeServersAndChannels: [(HTTPBin, Channel)]?
XCTAssertNoThrow(maybeServersAndChannels = try (0..<10).map { _ in
let web = HTTPBin()
defer {
XCTAssertNoThrow(try web.shutdown())
}

let req = try! HTTPClient.Request(url: "http://localhost:\(web.serverChannel.localAddress!.port!)/get",
method: .GET,
body: nil)
var maybeConnection: ConnectionPool.Connection?
XCTAssertNoThrow(try maybeConnection = client.pool.getConnection(for: req,
preference: .indifferent,
on: client.eventLoopGroup.next(),
deadline: nil).wait())
guard let connection = maybeConnection else {
XCTFail("couldn't make connection")
throw NoChannelError()
}

let channel = connection.channel
client.pool.release(connection)
return (web, channel)
})

guard let serversAndChannels = maybeServersAndChannels else {
XCTFail("couldn't open servers")
return
}

DispatchQueue.global().async {
serversAndChannels.forEach { serverAndChannel in
serverAndChannel.1.close(promise: nil)
}
}
XCTAssertNoThrow(try client.syncShutdown())
}
}