aherman
/
proxysql
mirror of https://github.com/sysown/proxysql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix reg_test_unexp_ping_pkt for isolated CI networking and Prometheus labels

Browse Source 
The reg_test_unexp_ping_pkt TAP failure on legacy-g2 was caused by multiple test-side issues that became visible after moving from host-local 127.0.0.1 execution with port mapping to isolated Docker containers on a private network.

The first failure happened during the initial setup path: the test connected with ProxySQL root credentials and root host, but used cl.mysql_port instead of cl.root_port. In the old port-mapped layout this mistake could be masked more easily. In the isolated DNS-based setup used by legacy-g2, root/admin/frontend and backend ports are distinct and the mismatch causes an immediate connect failure. This change routes the setup connections through the correct ProxySQL root port and adds targeted connection diagnostics so future CI failures show the exact host, port, user, and MySQL error involved.

The second failure was a latent prepared-statement bug in the test data loader. MYSQL_BIND.length pointed to a block-local variable that went out of scope before mysql_stmt_execute(), which led to intermittent or immediate client-side failures such as 'Client run out of memory' when inserting the large LONGTEXT payload used by the test. This change keeps the bound length alive for the full execution window and adds payload-size logging so the expensive setup phase is visible in TAP logs.

The final failure was in metric validation, not in ProxySQL behavior. ProxySQL exports proxysql_mysql_unexpected_frontend_com_ping_total as a labeled Prometheus series, for example with {protocol="mysql"}. The test previously looked up the metric by exact key, which silently read zero from the parsed map and made the assertion fail even though ProxySQL was correctly detecting and handling the unexpected COM_PING packets. This change resolves the metric by prefix, records how many matching series were found, and logs the before/after values and delta explicitly.

Verification:
- rebuilt test/tap/tests/reg_test_unexp_ping_pkt-t
- executed the test directly against the live legacy-g2 ProxySQL instance and observed ok 9 / exit 0
- executed the isolated CI-style path with TEST_PY_TAP_INCL=reg_test_unexp_ping_pkt-t via test/infra/control/run-tests-isolated.bash and observed PASS 1/294 : FAIL 0/294

This commit intentionally does not include unrelated orchestrator configuration edits that were already present in the worktree.
pull/5453/head
Rene Cannao 2 months ago
parent 98c03d6fc6
commit 7384bea084
1 changed files with 62 additions and 24 deletions
Show Stats Download Patch File Download Diff File

86
test/tap/tests/reg_test_unexp_ping_pkt-t.cpp
Unescape View File

@ -39,6 +39,21 @@ struct cmd_opts_t {
int ping_delay { 10 };
};
static bool connect_or_diag(
MYSQL* conn, const char* label, const char* host, const char* user, const char* password, unsigned int port
) {
diag("Connecting %s host='%s' port=%u user='%s'", label, host, port, user);
if (mysql_real_connect(conn, host, user, password, NULL, port, NULL, 0)) {
return true;
}
diag(
"Connect failed for %s host='%s' port=%u user='%s' errno=%u error=\"%s\"",
label, host, port, user, mysql_errno(conn), mysql_error(conn)
);
return false;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
// NOTE: JUST SOME DECLARATIONS (MARIADBCLIENT) FOR ACCESSING SSL CTX //
////////////////////////////////////////////////////////////////////////////////////////////////////
@ -231,6 +246,26 @@ rc_t<map<string,double>> get_prometheus_metrics(MYSQL* admin) {
return { 0, parse_prometheus_metrics(row_value) };
}
double get_metric_value_by_prefix(
const map<string, double>& metrics, const string& metric_name, size_t* match_count = nullptr
) {
double metric_value { 0 };
size_t matches { 0 };
for (const auto& metric : metrics) {
if (metric.first == metric_name || metric.first.rfind(metric_name + "{", 0) == 0) {
metric_value += metric.second;
matches += 1;
}
}
if (match_count) {
*match_count = matches;
}
return metric_value;
}
int exec_config_queries(MYSQL* admin, const vector<string>& cfg_queries) {
diag("Configuring ProxySQL for test");
for (const string& q : cfg_queries) {
@ -506,14 +541,29 @@ int perfom_tests_with_cfgs(CommandLine& cl, MYSQL* admin, const cmd_opts_t& opts
int rc { test_unex_com_ping(rc_conn.second, opts) };
auto post_metrics { get_prometheus_metrics(admin) };
const auto pre_val { pre_metrics.second["proxysql_mysql_unexpected_frontend_com_ping_total"] };
const auto post_val { post_metrics.second["proxysql_mysql_unexpected_frontend_com_ping_total"] };
size_t pre_matches { 0 };
size_t post_matches { 0 };
const auto pre_val {
get_metric_value_by_prefix(
pre_metrics.second, "proxysql_mysql_unexpected_frontend_com_ping_total", &pre_matches
)
};
const auto post_val {
get_metric_value_by_prefix(
post_metrics.second, "proxysql_mysql_unexpected_frontend_com_ping_total", &post_matches
)
};
const auto diff { post_val - pre_val };
diag(
"Unexpected COM_PING metric lookup pre_matches=%zu post_matches=%zu pre_val=%lf post_val=%lf diff=%lf",
pre_matches, post_matches, pre_val, post_val, diff
);
ok(rc == EXIT_SUCCESS, "Connection should be usable till close (no-disconnect)");
ok(
diff == opts.ping_count,
pre_matches > 0 && post_matches > 0 && diff == opts.ping_count,
"Metrics diff should match sent COM_PING packets sent=%d pre_val=%lf post_val=%lf diff=%lf",
opts.ping_count, pre_val, post_val, diff
);
@ -553,11 +603,7 @@ int main(int argc, const char* argv[]) {
{
MYSQL* proxy = mysql_init(NULL);
if (
!mysql_real_connect(
proxy, cl.root_host, cl.root_username, cl.root_password, NULL, cl.mysql_port, NULL, 0
)
) {
if (!connect_or_diag(proxy, "proxy root setup", cl.root_host, cl.root_username, cl.root_password, cl.root_port)) {
fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mysql_error(proxy));
return EXIT_FAILURE;
}
@ -578,11 +624,7 @@ int main(int argc, const char* argv[]) {
{
MYSQL* proxy = mysql_init(NULL);
if (
!mysql_real_connect(
proxy, cl.root_host, cl.root_username, cl.root_password, NULL, cl.mysql_port, NULL, 0
)
) {
if (!connect_or_diag(proxy, "proxy root data setup", cl.root_host, cl.root_username, cl.root_password, cl.root_port)) {
fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mysql_error(proxy));
return EXIT_FAILURE;
}
@ -614,13 +656,11 @@ int main(int argc, const char* argv[]) {
MYSQL_BIND bind[1];
memset(bind, 0, sizeof(bind));
{
uint64_t len = rnd_str.size();
bind[0].buffer_type = MYSQL_TYPE_STRING;
bind[0].buffer = const_cast<char*>(rnd_str.c_str());
bind[0].buffer_length = len;
bind[0].length = &len;
}
unsigned long rnd_str_len = rnd_str.size();
bind[0].buffer_type = MYSQL_TYPE_STRING;
bind[0].buffer = const_cast<char*>(rnd_str.c_str());
bind[0].buffer_length = rnd_str_len;
bind[0].length = &rnd_str_len;
if (mysql_stmt_bind_param(stmt, bind)) {
diag("INSERT bind failed error=\"%s\"", mysql_stmt_error(stmt));
@ -628,7 +668,7 @@ int main(int argc, const char* argv[]) {
return EXIT_FAILURE;
}
diag("Inserting test data");
diag("Inserting test data payload_size=%lu", rnd_str_len);
if (mysql_stmt_execute(stmt)) {
diag("INSERT execute failed error=\"%s\"", mysql_stmt_error(stmt));
mysql_stmt_close(stmt);
@ -642,9 +682,7 @@ int main(int argc, const char* argv[]) {
MYSQL* admin = mysql_init(NULL);
if (!mysql_real_connect(
admin, cl.host, cl.admin_username, cl.admin_password, NULL, cl.admin_port, NULL, 0
)) {
if (!connect_or_diag(admin, "proxy admin", cl.host, cl.admin_username, cl.admin_password, cl.admin_port)) {
fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mysql_error(admin));
return EXIT_FAILURE;
}

Write Preview
Loading…
Cancel
Save