Skip to content

[HTTPConnectionPool] StateMachine has explicit function for HTTP1 connection close #448

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

Merged
merged 1 commit into from
Oct 1, 2021
Merged

[HTTPConnectionPool] StateMachine has explicit function for HTTP1 connection close #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Sources/AsyncHTTPClient/ConnectionPool/HTTPConnectionPool.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ extension HTTPConnectionPool: HTTP1ConnectionDelegate {
"ahc-http-version": "http/1.1",
])
self.modifyStateAndRunActions {
$0.connectionClosed(connection.id)
$0.http1ConnectionClosed(connection.id)
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...s/AsyncHTTPClient/ConnectionPool/State Machine/HTTPConnectionPool+HTTP1StateMachine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ extension HTTPConnectionPool {
}

/// A connection has been unexpectedly closed
mutating func connectionClosed(_ connectionID: Connection.ID) -> Action {
mutating func http1ConnectionClosed(_ connectionID: Connection.ID) -> Action {
guard let (index, context) = self.connections.failConnection(connectionID) else {
// When a connection close is initiated by the connection pool, the connection will
// still report its close to the state machine. In those cases we must ignore the
Expand Down
4 changes: 2 additions & 2 deletions Sources/AsyncHTTPClient/ConnectionPool/State Machine/HTTPConnectionPool+StateMachine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,10 @@ extension HTTPConnectionPool {
}

/// A connection has been closed
mutating func connectionClosed(_ connectionID: Connection.ID) -> Action {
mutating func http1ConnectionClosed(_ connectionID: Connection.ID) -> Action {
switch self.state {
case .http1(var http1StateMachine):
let action = http1StateMachine.connectionClosed(connectionID)
let action = http1StateMachine.http1ConnectionClosed(connectionID)
self.state = .http1(http1StateMachine)
return action
}
Expand Down
12 changes: 6 additions & 6 deletions Tests/AsyncHTTPClientTests/HTTPConnectionPool+HTTP1StateTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ class HTTPConnectionPool_HTTP1StateMachineTests: XCTestCase {
XCTAssertEqual(failAction.request, .failRequest(finalRequest, HTTPClientError.alreadyShutdown, cancelTimeout: false))

// 5. close open connection
let closeAction = state.connectionClosed(connectionID)
let closeAction = state.http1ConnectionClosed(connectionID)
XCTAssertEqual(closeAction.connection, .cleanupConnections(.init(), isShutdown: .yes(unclean: true)))
XCTAssertEqual(closeAction.request, .none)
}
Expand Down Expand Up @@ -371,7 +371,7 @@ class HTTPConnectionPool_HTTP1StateMachineTests: XCTestCase {
let doneAction = state.http1ConnectionReleased(connectionID)
XCTAssertEqual(doneAction.request, .none)
XCTAssertEqual(doneAction.connection, .closeConnection(connection, isShutdown: .no))
XCTAssertEqual(state.connectionClosed(connectionID), .none)
XCTAssertEqual(state.http1ConnectionClosed(connectionID), .none)

case .cancelTimeoutTimer(let connectionID):
guard let expectedConnection = connections.newestParkedConnection(for: reqEventLoop) ?? connections.newestParkedConnection else {
Expand Down Expand Up @@ -428,7 +428,7 @@ class HTTPConnectionPool_HTTP1StateMachineTests: XCTestCase {
XCTAssertEqual(connections.parked, 7)
XCTAssertEqual(connections.used, 1)
XCTAssertNoThrow(try connections.abortConnection(connectionToAbort.id))
XCTAssertEqual(state.connectionClosed(connectionToAbort.id), .none)
XCTAssertEqual(state.http1ConnectionClosed(connectionToAbort.id), .none)
XCTAssertEqual(connections.parked, 7)
XCTAssertEqual(connections.used, 0)
}
Expand All @@ -448,7 +448,7 @@ class HTTPConnectionPool_HTTP1StateMachineTests: XCTestCase {
return XCTFail("Expected to have a parked connection")
}
XCTAssertNoThrow(try connections.closeConnection(connectionToClose))
XCTAssertEqual(state.connectionClosed(connectionToClose.id), .none)
XCTAssertEqual(state.http1ConnectionClosed(connectionToClose.id), .none)
XCTAssertEqual(connections.parked, 7)
}

Expand Down Expand Up @@ -499,7 +499,7 @@ class HTTPConnectionPool_HTTP1StateMachineTests: XCTestCase {
while let closedConnection = connections.randomLeasedConnection() {
XCTAssertNoThrow(try connections.abortConnection(closedConnection.id))
XCTAssertEqual(connections.parked, 0)
let action = state.connectionClosed(closedConnection.id)
let action = state.http1ConnectionClosed(closedConnection.id)

switch action.connection {
case .createConnection(let newConnectionID, on: let eventLoop):
Expand Down Expand Up @@ -584,7 +584,7 @@ class HTTPConnectionPool_HTTP1StateMachineTests: XCTestCase {

// triggered by remote peer
XCTAssertNoThrow(try connections.abortConnection(connection.id))
XCTAssertEqual(state.connectionClosed(connection.id), .none)
XCTAssertEqual(state.http1ConnectionClosed(connection.id), .none)

// triggered by timer
XCTAssertEqual(state.connectionIdleTimeout(connection.id), .none)
Expand Down