Skip to content

Restores the traffic_server option for --maxRecords #10388

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
zwoop merged 1 commit into from
Sep 8, 2023
Merged

Restores the traffic_server option for --maxRecords #10388

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
3 changes: 3 additions & 0 deletions include/records/I_RecordsConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@

#include "records/P_RecCore.h"

// This is to manage the librecords table sizes. Not awesome, but better than the earlier recompiling of ATS requirement...
extern int max_records_entries;

enum RecordRequiredType {
RR_NULL, // config is _not_ required to be defined in records.yaml
RR_REQUIRED // config _is_ required to be defined in record.config
Expand Down
2 changes: 1 addition & 1 deletion include/records/P_RecCore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <swoc/Errata.h>

// records, record hash-table, and hash-table rwlock
extern RecRecord g_records[REC_MAX_RECORDS];
extern RecRecord *g_records;
extern std::unordered_map<std::string, RecRecord *> g_records_ht;
extern ink_rwlock g_records_rwlock;
extern int g_num_records;
Expand Down
2 changes: 1 addition & 1 deletion include/records/P_RecDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
// We need at least this many internal record entries for our configurations and metrics.
// This may need adjustments if we make significant additions to librecords. Note that
// plugins are using their own metrics systems.
#define REC_MAX_RECORDS 1500
#define REC_MAX_RECORDS 2048
#define REC_CONFIG_UPDATE_INTERVAL_MS 3000
#define REC_REMOTE_SYNC_INTERVAL_MS 5000

Expand Down
9 changes: 8 additions & 1 deletion src/records/RecCore.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,13 @@
#include "tscpp/util/ts_errata.h"
#include "api/Metrics.h"

// This is needed to manage the size of the librecords record. It can't be static, because it needs to be modified
// and used (read) from several binaries / modules.
int max_records_entries = REC_MAX_RECORDS;

static bool g_initialized = false;

RecRecord g_records[REC_MAX_RECORDS];
RecRecord *g_records = nullptr;
std::unordered_map<std::string, RecRecord *> g_records_ht;
ink_rwlock g_records_rwlock;
int g_num_records = 0;
Expand Down Expand Up @@ -202,6 +206,9 @@ RecCoreInit(Diags *_diags)

g_num_records = 0;

// initialize record array for our internal stats (this can be reallocated later)
g_records = static_cast<RecRecord *>(ats_malloc(max_records_entries * sizeof(RecRecord)));

// initialize record rwlock
ink_rwlock_init(&g_records_rwlock);

Expand Down
2 changes: 2 additions & 0 deletions src/traffic_server/traffic_server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ static ArgumentDescription argument_descriptions[] = {
{"disable_freelist", 'f', "Disable the freelist memory allocator", "T", &cmd_disable_freelist, "PROXY_DPRINTF_LEVEL", nullptr},
{"disable_pfreelist", 'F', "Disable the freelist memory allocator in ProxyAllocator", "T", &cmd_disable_pfreelist,
"PROXY_DPRINTF_LEVEL", nullptr},
{"maxRecords", 'm', "Max number of librecords metrics and configurations (default & minimum: 2048)", "I", &max_records_entries,
"PROXY_MAX_RECORDS", nullptr},

#if TS_HAS_TESTS
{"regression", 'R', "Regression Level (quick:1..long:3)", "I", &regression_level, "PROXY_REGRESSION", nullptr},
Expand Down