swift-server/async-http-client
1
0
Fork 0
mirror of https://github.com/swift-server/async-http-client.git synced 2026-06-02 07:37:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[HTTP2] Integrate HTTP2StateMachine into HTTPConnectionPool.StateMachine (#462)

Browse Source
This commit is contained in:
David Nadoba
2021-11-02 11:51:18 +00:00
committed by GitHub
parent 4147fd647d
commit 149b8d2656
9 changed files with 573 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/AsyncHTTPClient/ConnectionPool/State Machine/HTTPConnectionPool+HTTP2StateMachine.swift
+39 -21
View File
@@ -49,20 +49,6 @@ extension HTTPConnectionPool {
self.connections = HTTP2Connections(generator: idGenerator)
}
mutating func migrateFromHTTP1(
http1State: HTTP1StateMachine,
newHTTP2Connection: Connection,
maxConcurrentStreams: Int
) -> Action {
self.migrateFromHTTP1(
http1Connections: http1State.connections,
http2Connections: http1State.http2Connections,
requests: http1State.requests,
newHTTP2Connection: newHTTP2Connection,
maxConcurrentStreams: maxConcurrentStreams
)
}
mutating func migrateFromHTTP1(
http1Connections: HTTP1Connections,
http2Connections: HTTP2Connections? = nil,
@@ -228,11 +214,22 @@ extension HTTPConnectionPool {
private mutating func _newHTTP2ConnectionEstablished(_ connection: Connection, maxConcurrentStreams: Int) -> EstablishedAction {
self.failedConsecutiveConnectionAttempts = 0
self.lastConnectFailure = nil
let (index, context) = self.connections.newHTTP2ConnectionEstablished(
connection,
maxConcurrentStreams: maxConcurrentStreams
)
return self.nextActionForAvailableConnection(at: index, context: context)
if self.connections.hasActiveConnection(for: connection.eventLoop) {
guard let (index, _) = self.connections.failConnection(connection.id) else {
preconditionFailure("we have established a new connection that we know nothing about?")
}
self.connections.removeConnection(at: index)
return .init(
request: .none,
connection: .closeConnection(connection, isShutdown: .no)
)
} else {
let (index, context) = self.connections.newHTTP2ConnectionEstablished(
connection,
maxConcurrentStreams: maxConcurrentStreams
)
return self.nextActionForAvailableConnection(at: index, context: context)
}
}
private mutating func nextActionForAvailableConnection(
@@ -318,8 +315,28 @@ extension HTTPConnectionPool {
private mutating func nextActionForFailedConnection(at index: Int, on eventLoop: EventLoop) -> Action {
switch self.state {
case .running:
let hasPendingRequest = !self.requests.isEmpty(for: eventLoop) || !self.requests.isEmpty(for: nil)
guard hasPendingRequest else {
// we do not know if we have created this connection for a request with a required
// event loop or not. However, we do not need this information and can infer
// if we need to create a new connection because we will only ever create one connection
// per event loop for required event loop requests and only need one connection for
// general purpose requests.
// we need to start a new on connection in two cases:
let needGeneralPurposeConnection =
// 1. if we have general purpose requests
!self.requests.isEmpty(for: nil) &&
// and no connection starting or active
!self.connections.hasStartingOrActiveConnection()
let needRequiredEventLoopConnection =
// 2. or if we have requests for a required event loop
!self.requests.isEmpty(for: eventLoop) &&
// and no connection starting or active for the given event loop
!self.connections.hasStartingOrActiveConnection(for: eventLoop)
guard needGeneralPurposeConnection || needRequiredEventLoopConnection else {
// otherwise we can remove the connection
self.connections.removeConnection(at: index)
return .none
}
@@ -330,6 +347,7 @@ extension HTTPConnectionPool {
request: .none,
connection: .createConnection(newConnectionID, on: eventLoop)
)
case .shuttingDown(let unclean):
assert(self.requests.isEmpty)
self.connections.removeConnection(at: index)