Skip to content

HttpConnectionCount move to iocore/net #10696

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
bneradt merged 3 commits into from
Nov 1, 2023
Merged

HttpConnectionCount move to iocore/net #10696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c977140
HttpConnectionCount move to iocore/net
bneradt Oct 30, 2023
d004723
Build updates for test_net
bneradt Oct 30, 2023
2bb82fa
Fix tls_bridge to use Regex from tscore
bneradt Oct 30, 2023
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
90 changes: 44 additions & 46 deletions include/proxy/http/HttpConnectionCount.h → include/iocore/net/ConnectionTracker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,21 @@
#include "swoc/bwf_fwd.h"
#include "swoc/TextView.h"
#include <tscore/MgmtDefs.h>
#include "proxy/http/HttpProxyAPIEnums.h"
#include "proxy/Show.h"
#include "iocore/net/SessionSharingAPIEnums.h"

/**
* Singleton class to keep track of the number of outbound connections.
*
* Outbound connections are divided in to equivalence classes (called "groups" here) based on the
* session matching setting. Tracking data is stored for each group.
*/
class OutboundConnTrack
class ConnectionTracker
{
using self_type = OutboundConnTrack; ///< Self reference type.
using self_type = ConnectionTracker; ///< Self reference type.

public:
// Non-copyable.
OutboundConnTrack(const self_type &) = delete;
ConnectionTracker(const self_type &) = delete;
self_type &operator=(const self_type &) = delete;

/// Definition of an upstream server group equivalence class.
Expand All @@ -71,23 +70,23 @@ class OutboundConnTrack

/// Per transaction configuration values.
struct TxnConfig {
int max{0}; ///< Maximum concurrent connections.
int min{0}; ///< Minimum keepalive connections.
MatchType match{MATCH_IP}; ///< Match type.
int server_max{0}; ///< Maximum concurrent server connections.
int server_min{0}; ///< Minimum keepalive server connections.
MatchType server_match{MATCH_IP}; ///< Server match type.
};

/** Static configuration values. */
struct GlobalConfig {
std::chrono::seconds alert_delay{60}; ///< Alert delay in seconds.
std::chrono::seconds server_alert_delay{60}; ///< Alert delay in seconds.
};

// The names of the configuration values.
// Unfortunately these are not used in RecordsConfig.cc so that must be made consistent by hand.
// Note: These need to be @c constexpr or there are static initialization ordering risks.
static constexpr std::string_view CONFIG_VAR_MAX{"proxy.config.http.per_server.connection.max"};
static constexpr std::string_view CONFIG_VAR_MIN{"proxy.config.http.per_server.connection.min"};
static constexpr std::string_view CONFIG_VAR_MATCH{"proxy.config.http.per_server.connection.match"};
static constexpr std::string_view CONFIG_VAR_ALERT_DELAY{"proxy.config.http.per_server.connection.alert_delay"};
static constexpr std::string_view CONFIG_SERVER_VAR_MAX{"proxy.config.http.per_server.connection.max"};
static constexpr std::string_view CONFIG_SERVER_VAR_MIN{"proxy.config.http.per_server.connection.min"};
static constexpr std::string_view CONFIG_SERVER_VAR_MATCH{"proxy.config.http.per_server.connection.match"};
static constexpr std::string_view CONFIG_SERVER_VAR_ALERT_DELAY{"proxy.config.http.per_server.connection.alert_delay"};

/// A record for the outbound connection count.
/// These are stored per outbound session equivalence class, as determined by the session matching.
Expand Down Expand Up @@ -118,7 +117,7 @@ class OutboundConnTrack
// Counting data.
std::atomic<int> _count{0}; ///< Number of outbound connections.
std::atomic<int> _count_max{0}; ///< largest observed @a count value.
std::atomic<int> _blocked{0}; ///< Number of outbound connections blocked since last alert.
std::atomic<int> _blocked{0}; ///< Number of connections blocked since last alert.
std::atomic<int> _in_queue{0}; ///< # of connections queued, waiting for a connection.
std::atomic<Ticker> _last_alert{0}; ///< Absolute time of the last alert.

Expand All @@ -130,6 +129,7 @@ class OutboundConnTrack
* Construct from @c Key because the use cases do a table lookup first so the @c Key is already constructed.
* @param key A populated @c Key structure - values are copied to the @c Group.
* @param fqdn The full FQDN.
* @param min_keep_alive The minimum number of origin keep alive connections to maintain.
*/
Group(Key const &key, std::string_view fqdn, int min_keep_alive);
/// Key equality checker.
Expand Down Expand Up @@ -182,22 +182,22 @@ class OutboundConnTrack

/** Generate a Warning that a connection was blocked.
*
* @param config Transaction local configuration.
* @param sm_id State machine ID to display in Warning.
* @param max_connections The maximum configured number of connections for the group.
* @param sm_id ID to display in Warning.
* @param count Count value to display in Warning.
* @param addr IP address of the upstream.
* @param debug_tag Tag to use for the debug message. If no debug message should be generated set this to @c nullptr.
*/
void Warn_Blocked(const TxnConfig *config, int64_t sm_id, int count, const sockaddr *addr, const char *debug_tag = nullptr);
void Warn_Blocked(int max_connections, int64_t id, int count, const sockaddr *addr, const char *debug_tag = nullptr);
};

/** Get or create the @c Group for the specified session properties.
/** Get or create the @c Group for the specified outbound session properties.
* @param txn_cnf The transaction local configuration.
* @param fqdn The fully qualified domain name of the upstream.
* @param addr The IP address of the upstream.
* @return A @c Group for the arguments, existing if possible and created if not.
*/
static TxnState obtain(TxnConfig const &txn_cnf, std::string_view fqdn, const IpEndpoint &addr);
static TxnState obtain_outbound(TxnConfig const &txn_cnf, std::string_view fqdn, IpEndpoint const &addr);

/** Get the currently existing groups.
* @param [out] groups parameter - pointers to the groups are pushed in to this container.
Expand Down Expand Up @@ -244,9 +244,9 @@ class OutboundConnTrack
static void Warning_Bad_Match_Type(std::string_view tag);

// Converters for overridable values for use in the TS API.
static const MgmtConverter MIN_CONV;
static const MgmtConverter MAX_CONV;
static const MgmtConverter MATCH_CONV;
static const MgmtConverter MIN_SERVER_CONV;
static const MgmtConverter MAX_SERVER_CONV;
static const MgmtConverter SERVER_MATCH_CONV;

protected:
static GlobalConfig *_global_config; ///< Global configuration data.
Expand Down Expand Up @@ -278,13 +278,13 @@ class OutboundConnTrack
Imp &instance();
};

inline OutboundConnTrack::Imp &
OutboundConnTrack::instance()
inline ConnectionTracker::Imp &
ConnectionTracker::instance()
{
return _imp;
}

inline OutboundConnTrack::Group::Group(Key const &key, std::string_view fqdn, int min_keep_alive)
inline ConnectionTracker::Group::Group(Key const &key, std::string_view fqdn, int min_keep_alive)
: _hash(key._hash), _match_type(key._match_type), min_keep_alive_conns(min_keep_alive), _key{_addr, _hash, _match_type}
{
// store the host name if relevant.
Expand All @@ -300,7 +300,7 @@ inline OutboundConnTrack::Group::Group(Key const &key, std::string_view fqdn, in
}

inline uint64_t
OutboundConnTrack::Group::hash(const Key &key)
ConnectionTracker::Group::hash(const Key &key)
{
switch (key._match_type) {
case MATCH_IP:
Expand All @@ -317,43 +317,43 @@ OutboundConnTrack::Group::hash(const Key &key)
}

inline bool
OutboundConnTrack::TxnState::is_active()
ConnectionTracker::TxnState::is_active()
{
return nullptr != _g;
}

inline int
OutboundConnTrack::TxnState::reserve()
ConnectionTracker::TxnState::reserve()
{
_reserved_p = true;
return ++_g->_count;
}

inline void
OutboundConnTrack::TxnState::release()
ConnectionTracker::TxnState::release()
{
if (_reserved_p) {
_reserved_p = false;
--_g->_count;
}
}

inline OutboundConnTrack::Group *
OutboundConnTrack::TxnState::drop()
inline ConnectionTracker::Group *
ConnectionTracker::TxnState::drop()
{
_reserved_p = false;
return _g;
}

inline int
OutboundConnTrack::TxnState::enqueue()
ConnectionTracker::TxnState::enqueue()
{
_queued_p = true;
return ++_g->_in_queue;
}

inline void
OutboundConnTrack::TxnState::dequeue()
ConnectionTracker::TxnState::dequeue()
{
if (_queued_p) {
_queued_p = false;
Expand All @@ -362,7 +362,7 @@ OutboundConnTrack::TxnState::dequeue()
}

inline void
OutboundConnTrack::TxnState::clear()
ConnectionTracker::TxnState::clear()
{
if (_g) {
this->dequeue();
Expand All @@ -372,7 +372,7 @@ OutboundConnTrack::TxnState::clear()
}

inline void
OutboundConnTrack::TxnState::update_max_count(int count)
ConnectionTracker::TxnState::update_max_count(int count)
{
auto cmax = _g->_count_max.load();
if (count > cmax) {
Expand All @@ -381,48 +381,46 @@ OutboundConnTrack::TxnState::update_max_count(int count)
}

inline void
OutboundConnTrack::TxnState::blocked()
ConnectionTracker::TxnState::blocked()
{
++_g->_blocked;
}

/* === Linkage === */
inline auto
OutboundConnTrack::Linkage::next_ptr(value_type *value) -> value_type *&
ConnectionTracker::Linkage::next_ptr(value_type *value) -> value_type *&
{
return value->_next;
}

inline auto
OutboundConnTrack::Linkage::prev_ptr(value_type *value) -> value_type *&
ConnectionTracker::Linkage::prev_ptr(value_type *value) -> value_type *&
{
return value->_prev;
}

inline uint64_t
OutboundConnTrack::Linkage::hash_of(key_type key)
ConnectionTracker::Linkage::hash_of(key_type key)
{
return Group::hash(key);
}

inline auto
OutboundConnTrack::Linkage::key_of(value_type *value) -> key_type
ConnectionTracker::Linkage::key_of(value_type *value) -> key_type
{
return value->_key;
}

inline bool
OutboundConnTrack::Linkage::equal(key_type lhs, key_type rhs)
ConnectionTracker::Linkage::equal(key_type lhs, key_type rhs)
{
return Group::equal(lhs, rhs);
}
/* === */

Action *register_ShowConnectionCount(Continuation *, HTTPHdr *);

namespace swoc
{
BufferWriter &bwformat(BufferWriter &w, bwf::Spec const &spec, OutboundConnTrack::MatchType type);
BufferWriter &bwformat(BufferWriter &w, bwf::Spec const &spec, OutboundConnTrack::Group::Key const &key);
BufferWriter &bwformat(BufferWriter &w, bwf::Spec const &spec, OutboundConnTrack::Group const &g);
BufferWriter &bwformat(BufferWriter &w, bwf::Spec const &spec, ConnectionTracker::MatchType type);
BufferWriter &bwformat(BufferWriter &w, bwf::Spec const &spec, ConnectionTracker::Group::Key const &key);
BufferWriter &bwformat(BufferWriter &w, bwf::Spec const &spec, ConnectionTracker::Group const &g);
} // namespace swoc
0 include/proxy/http/HttpProxyAPIEnums.h → include/iocore/net/SessionSharingAPIEnums.h
View file
Open in desktop
Copy link
Contributor

@masaori335 masaori335 Nov 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ConnectionTracker is using enums in this header?

Copy link
Contributor Author

@bneradt bneradt Nov 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.
  };

File renamed without changes.
7 changes: 4 additions & 3 deletions include/proxy/PoolableSession.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

#pragma once

#include "iocore/net/ConnectionTracker.h"
#include "proxy/ProxySession.h"

class PoolableSession : public ProxySession
Expand Down Expand Up @@ -74,7 +75,7 @@ class PoolableSession : public ProxySession
TSServerSessionSharingMatchMask sharing_match = TS_SERVER_SESSION_SHARING_MATCH_MASK_NONE;
TSServerSessionSharingPoolType sharing_pool = TS_SERVER_SESSION_SHARING_POOL_GLOBAL;

void enable_outbound_connection_tracking(OutboundConnTrack::Group *group);
void enable_outbound_connection_tracking(ConnectionTracker::Group *group);
void release_outbound_connection_tracking();

void attach_hostname(const char *hostname);
Expand All @@ -89,7 +90,7 @@ class PoolableSession : public ProxySession

// Keep track of connection limiting and a pointer to the
// singleton that keeps track of the connection counts.
OutboundConnTrack::Group *conn_track_group = nullptr;
ConnectionTracker::Group *conn_track_group = nullptr;

virtual IOBufferReader *get_remote_reader() = 0;

Expand Down Expand Up @@ -209,7 +210,7 @@ PoolableSession::FQDNLinkage::equal(CryptoHash const &lhs, CryptoHash const &rhs
}

inline void
PoolableSession::enable_outbound_connection_tracking(OutboundConnTrack::Group *group)
PoolableSession::enable_outbound_connection_tracking(ConnectionTracker::Group *group)
{
ink_assert(nullptr == conn_track_group);
conn_track_group = group;
Expand Down
4 changes: 2 additions & 2 deletions include/proxy/http/Http1ServerSession.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

#pragma once

#include "proxy/http/HttpConnectionCount.h"
#include "proxy/http/HttpProxyAPIEnums.h"
#include "iocore/net/ConnectionTracker.h"
#include "iocore/net/SessionSharingAPIEnums.h"
#include "proxy/PoolableSession.h"
#include "proxy/http/Http1ServerTransaction.h"

Expand Down
8 changes: 4 additions & 4 deletions include/proxy/http/HttpConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
#include "tscore/ink_resolver.h"
#include "tscore/Regex.h"
#include "tscpp/util/ts_bw.h"
#include "proxy/http/HttpProxyAPIEnums.h"
#include "iocore/eventsystem/ConfigProcessor.h"
#include "iocore/net/ConnectionTracker.h"
#include "iocore/net/SessionSharingAPIEnums.h"
#include "records/RecProcess.h"
#include "proxy/http/HttpConnectionCount.h"
#include "tscpp/util/ts_ip.h"
#include "api/Metrics.h"

Expand Down Expand Up @@ -638,7 +638,7 @@ struct OverridableHttpConfigParams {
MgmtInt default_buffer_water_mark = 32768;
MgmtInt slow_log_threshold = 0;

OutboundConnTrack::TxnConfig outbound_conntrack;
ConnectionTracker::TxnConfig connection_tracker_config;

MgmtInt plugin_vc_default_buffer_index = BUFFER_SIZE_INDEX_32K;
MgmtInt plugin_vc_default_buffer_water_mark = DEFAULT_PLUGIN_VC_BUFFER_WATER_MARK;
Expand Down Expand Up @@ -771,7 +771,7 @@ struct HttpConfigParams : public ConfigInfo {

MgmtByte server_session_sharing_pool = TS_SERVER_SESSION_SHARING_POOL_THREAD;

OutboundConnTrack::GlobalConfig global_outbound_conntrack;
ConnectionTracker::GlobalConfig global_connection_tracker_config;

// bitset to hold the status codes that will BE cached with negative caching enabled
HttpStatusBitset negative_caching_list;
Expand Down
4 changes: 2 additions & 2 deletions include/proxy/http/HttpTransact.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ using ink_time_t = time_t;
struct HttpConfigParams;
class HttpSM;

#include "iocore/net/ConnectionTracker.h"
#include "tscore/InkErrno.h"
#include "proxy/http/HttpConnectionCount.h"

#define UNKNOWN_INTERNAL_ERROR (INK_START_ERRNO - 1)

Expand Down Expand Up @@ -717,7 +717,7 @@ class HttpTransact
CacheLookupInfo cache_info;
ResolveInfo dns_info;
RedirectInfo redirect_info;
OutboundConnTrack::TxnState outbound_conn_track_state;
ConnectionTracker::TxnState outbound_conn_track_state;
ConnectionAttributes client_info;
ConnectionAttributes parent_info;
ConnectionAttributes server_info;
Expand Down
2 changes: 1 addition & 1 deletion include/shared/overridable_txn_vars.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#pragma once

#include <unordered_map>
#include "iocore/net/ConnectionTracker.h"
#include "proxy/hdrs/HTTP.h"
#include "proxy/http/HttpConnectionCount.h"

namespace ts
{
Expand Down
2 changes: 1 addition & 1 deletion plugins/experimental/tls_bridge/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
#
#######################

add_atsplugin(tls_bridge regex.cc tls_bridge.cc)
add_atsplugin(tls_bridge tls_bridge.cc)

target_link_libraries(tls_bridge PRIVATE libswoc ts::tscpputil)
Loading