HttpConnectionCount move to iocore/net#10696
Merged
bneradt merged 3 commits intoapache:masterfrom Nov 1, 2023
Merged
Conversation
bneradt
force-pushed
the
move_http_connection_count_to_iocore_net
branch
2 times, most recently
from
86b09f9 to
e051fc9
Compare
Contributor
|
Let me clarify that this PR has
But doesn't have
|
masaori335
reviewed
Oct 31, 2023
Contributor
Author
Yep, I think that covers it. |
bneradt
force-pushed
the
move_http_connection_count_to_iocore_net
branch
from
e051fc9 to
94f6000
Compare
Contributor
Author
And this has the implementation of per_client connection max: I'll take that out of draft once this lands. |
masaori335
reviewed
Nov 1, 2023
This moves HttpConnectionCount to iocore/net from proxy/http in anticipation to using its functionality on the client accept connection side. While doing so, this also renames HttpConnectionCount to ConnectionTracker because it is no longer HTTP transaction specific.
Moving ConnectionTracker to iocore/net induced linking behavior differences that required these changes to fix test_net.
tls_bridge had previously linked to tscore, but had copied in its own version of Regex. This removes the duplicated code and logic which, with these changes, caused duplicate definitions errors.
bneradt
force-pushed
the
move_http_connection_count_to_iocore_net
branch
from
94f6000 to
2bb82fa
Compare
masaori335
reviewed
Nov 1, 2023
Contributor
There was a problem hiding this comment.
ConnectionTracker is using enums in this header?
Contributor
Author
There was a problem hiding this comment.
Yep, it uses the TS_SERVER_OUTBOUND_MATCH stuff to keep parity there:
enum MatchType {
MATCH_IP = TS_SERVER_OUTBOUND_MATCH_IP, ///< Match by IP address.
MATCH_PORT = TS_SERVER_OUTBOUND_MATCH_PORT, ///< Match by IP address and port.
MATCH_HOST = TS_SERVER_OUTBOUND_MATCH_HOST, ///< Match by hostname (FQDN).
MATCH_BOTH = TS_SERVER_OUTBOUND_MATCH_BOTH, ///< Hostname, IP Address and port.
};
masaori335
approved these changes
Nov 1, 2023
Contributor
masaori335
left a comment
masaori335
left a comment
There was a problem hiding this comment.
Now, this is simple cleanups and moving code.
SolidWallOfCode
approved these changes
Nov 1, 2023
bneradt
added a commit
to bneradt/trafficserver
that referenced
this pull request
Feb 6, 2024
* HttpConnectionCount move to iocore/net This moves HttpConnectionCount to iocore/net from proxy/http in anticipation to using its functionality on the client accept connection side. While doing so, this also renames HttpConnectionCount to ConnectionTracker because it is no longer HTTP transaction specific. * Build updates for test_net Moving ConnectionTracker to iocore/net induced linking behavior differences that required these changes to fix test_net. * Fix tls_bridge to use Regex from tscore tls_bridge had previously linked to tscore, but had copied in its own version of Regex. This removes the duplicated code and logic which, with these changes, caused duplicate definitions errors. (cherry picked from commit fc3f12e) Conflicts: include/proxy/http/HttpConnectionCount.h include/proxy/http/HttpProxyAPIEnums.h include/shared/overridable_txn_vars.h iocore/cache/test/main.cc iocore/net/ConnectionTracker.cc iocore/net/ConnectionTracker.h iocore/net/Makefile.am iocore/net/SessionSharingAPIEnums.h iocore/net/libinknet_stub.cc plugins/experimental/tls_bridge/CMakeLists.txt plugins/experimental/tls_bridge/tls_bridge.cc proxy/PoolableSession.h proxy/http/Http1ServerSession.h proxy/http/HttpConfig.h proxy/http/HttpConnectionCount.cc proxy/http/HttpConnectionCount.h proxy/http/HttpProxyAPIEnums.h proxy/http/HttpProxyServerMain.cc proxy/http/HttpSM.cc proxy/http/HttpTransact.h src/api/CMakeLists.txt src/iocore/net/CMakeLists.txt src/proxy/http/CMakeLists.txt src/proxy/http/HttpConfig.cc src/proxy/http/HttpConnectionCount.cc src/shared/overridable_txn_vars.cc src/tests/CMakeLists.txt src/traffic_server/InkAPI.cc Co-authored-by: Brian Neradt <brian.neradt@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This moves HttpConnectionCount to iocore/net from proxy/http in
anticipation to using its functionality on the client accept connection
side. While doing so, this also renames HttpConnectionCount to
ConnectionTracker because it is no longer HTTP transaction specific.