Skip to content

Add hit stats for remap rules #7909

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

Closed
sudheerv wants to merge 1 commit into from
Closed

Add hit stats for remap rules #7909

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: 2 additions & 0 deletions mgmt/RecordsConfig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1470,6 +1470,8 @@ static const RecordElement RecordsConfig[] =
//# Librecords based stats system (new as of v2.1.3)
{RECT_CONFIG, "proxy.config.stat_api.max_stats_allowed", RECD_INT, "256", RECU_RESTART_TS, RR_NULL, RECC_INT, "[256-1000]", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.stat_remap.max_stats_allowed", RECD_INT, "256", RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
,

//############
//#
Expand Down
34 changes: 34 additions & 0 deletions proxy/http/remap/UrlRewrite.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,24 @@

#define modulePrefix "[ReverseProxy]"

static RecRawStatBlock *remap_rsb = nullptr;
static uint32_t max_remap_stats = 256;

static void
register_remap_stats()
{
if (remap_rsb != nullptr) {
return;
}

remap_rsb = RecAllocateRawStatBlock(static_cast<int>(max_remap_stats + 1));

for (size_t id = 1; id <= max_remap_stats; id++) {
std::string name = "remap.rule." + std::to_string(id);
RecRegisterRawStat(remap_rsb, RECT_PROCESS, name.c_str(), RECD_COUNTER, RECP_NON_PERSISTENT, id, RecRawStatSyncSum);
}
}

/**
Determines where we are in a situation where a virtual path is
being mapped to a server home page. If it is, we set a special flag
Expand Down Expand Up @@ -81,6 +99,8 @@ UrlRewrite::load()

REC_ReadConfigInteger(reverse_proxy, "proxy.config.reverse_proxy.enabled");

REC_ReadConfigInteger(max_remap_stats, "proxy.config.stat_remap.max_stats_allowed");

/* Initialize the plugin factory */
pluginFactory.setRuntimeDir(RecConfigReadRuntimeDir()).addSearchDir(RecConfigReadPluginDir());

Expand Down Expand Up @@ -688,6 +708,10 @@ UrlRewrite::BuildTable(const char *path)
forward_mappings_with_recv_port.hash_lookup.reset(nullptr);
}

if (zret == 0) {
register_remap_stats();
}

return zret;
}

Expand Down Expand Up @@ -766,6 +790,16 @@ UrlRewrite::_mappingLookup(MappingsStore &mappings, URL *request_url, int reques
Debug("url_rewrite", "Using regex mapping with rank %d", (mapping_container.getMapping())->getRank());
retval = true;
}

if (retval) {
int id = 1 + (mapping_container.getMapping())->getRank();
if ((size_t)id < max_remap_stats) {
RecIncrRawStatSum(remap_rsb, this_ethread(), id, 1);
} else {
Debug("url_rewrite", "can't update stat, too many remap rules, max_stats configured %u, remap id %d", max_remap_stats, id);
}
}

return retval;
}

Expand Down