mirror of https://github.com/sysown/proxysql
v3.0_fix_ci-mysqlx-cache-and-soak
GH-Actions
v3.0
feature/aws-rds-monitor
v3.0_fix_codecov-coverage-path-prefix
issue-1288-load-mysql-variables-feedback
ci/fix-pgsql-socket-g1-cache-key
v3.0_fix_ci-mysqlx-fetch-depth
cleanup/drop-unreachable-port-defaults
feature/pgsql-native-backend-protocol
fix/pgsql-unix-socket
ci-pgsql-socket-g1
v3.0_fix_coverage-gcov-prefix-strip
fix/pgsql-omit-port-zero
aws-rds-bg
fix/jemalloc-page-size-auto-detect
docs/passthrough-auth-spec
feature/ci-codecov-tap-all-groups-callers
fix/run-tests-backtick-leak
ci/zstd-level-15
feature/ci-codecov-tap-all-groups-callees
v3.0_partition-fairness
feature/ci-codecov-tap-legacy-g2
v3.0_partition-gate
fix/ci-cache-restore-path
v3.0_fix-stale-pause-until
feature/perf-improvements-test2
fix/kill-proxysqlgenai-build-flag
feat/passthrough-auth
ci-trigger-tolerate-cleanup-401
fix/5790-mariadb-collation-255
fix/parsersql-1.0.3-pg-set-fixes
issue_5639
pgsql_dns_cache
fix/5755-followup-typecast-digest-fixtures
v3.0_merge-5776-5784
v3.0_latency_consistency_improvement
fix/galera-g5-cluster-start
fix/ghcr-pull-retry
v3.0_cap_violation_5767
ci-mariadb10-galera-GH-Actions
ci/fix-gr-g5-cluster-start
ci-mysql84-gr-g1-g9-GH-Actions
perf/pull-ci-base-from-ghcr
fix/split-test-groups
fix/rename-set-parser-workflow
gh-actions/add-set-parser-algorithm-3-g1
fix/4760-advertise-lenenc-auth-capability
feature/mysqlx-stack-consolidated
feature/mysqlx-asan-coverage-docker-isolation
fix/ci-unit-tests-tsan-project-name
feature/mysqlx-tsan-v3-companion
feature/ci-builds-add-tsan-matrix
ci-reduce-polling-interval
feature/mysqlx-tsan-workflow-only
feature/mysqlx-ci-validation-workflows
feature/mysqlx-test-leak-cleanup
feature/mysqlx-behavioural-tap
feature/mysqlx-parity-cleanup
ci-g5-enable-cluster
feature/mysqlx-tls-passthrough
feature/mysqlx-asymmetric-tls
feature/mysqlx-state-machines
feature/build-tsan-plumbing
feature/mysqlx-observability-p0
fix/mysqlx-review-findings
v3.0-test-ci
ci/fix-mysql-apt-key-expired-v2
ci/fix-mysql-apt-key-expired
mariadb-rpl-helper
fix-fc-parsing
ci/fix-upload-artifact-eacces
ci/fix-cache-prune-permissions
ci/shrink-test-cache
ci/fix-tap-build-target
ci/gh-actions-readme-pointer
ci/fix-mysql84-infradb-label
ci/add-missing-group-reusables
infra-mysql57-binlog
feature/pgbouncer-compat
v3.0_pgsql_sslkeylog_5281
fix/5554-resolution-family-limitation
fix/3p-ci-error-handling
v3.0-5493
v3.0-ci260322_cluster
copilot/extract-server-selection-algorithm
copilot/extract-health-state-logic
copilot/extract-query-rule-matching-logic
copilot/extract-connection-pool-logic
v3.0-set_parser_v3
feature/arm-builds
release-notes-3.0.6-4.0.6-draft
v3.0.6-add-tap-test_stats_table_check
v2.7.3-test260221
v4.0-mcp-stats
copilot/uninstall-amazon-linux-2023
fix-prometheus-labels-test
tap-mcp-client
agent-skill-tap-test
v4.0-tsdb1
v3.0-fix_5256
gh-pages
feature/modern-docs
v4.0
v4.0-fix-vec-search
v4.0_rag_sys_prompt
v4.0_rag_mcp
v4.0-tsdb
feature/v4-docs-init
otel_system_libs
otel_clean
v3.0-5288
otel
otel_2
fix/postgresql-cluster-sync
v3.0-releate_notes_scripts_fixes
test_gh-actions_triggers
postgresql-digest-testing-improvement
v3.0_select_auto_commit
v3.0-5218
fix-5221
fix/5186-proxysql-stop-admin-crash
v3.0-4951
add-claude-github-actions-1763877527835
fix-rpm
v3.0-DS_crash
add-claude-github-actions-1763663272333
add-claude-github-actions-1763663091346
add-claude-github-actions-1763663091411
add-claude-github-actions-1763476725261
add-claude-github-actions-1763476725489
v3.0_optimizations_and_stability
v2.7.3.1
v3.0.3-upgrade_json
v3.0.sonar-cli
v3.0.sonar-config
otel-tracepoint
v3.0.2-merge-upgrade_deps-add_new_distros
v3.0.2-upgrade_deps
v3.0.2-add_new_distros
v3.0-add_more_testing_groups
v3.0-upgrade_prometheus-cpp
v3.0-upgrade_json
v3.0-upgrade_sqlite3
v3.0-upgrade_libmicrohttpd
v3.0-upgrade_curl
v3.0-add_centos10_builds
v3.0-add_fedora42_builds
v3.0_PG_PrepStmt
v3.0-sliced_groups
v3.0_auth_negotiation
v2.7
v2.7-fix_run_name
v3.0_4799_4827
v3.0-3687
v2.7-pmm_runtime_servers_metrics
v2.7-4839
v2.7-4841
v2.7-bump_version_to_2.7.3
2.6.6-4841
v2.x_pg_PrepStmtBase_240714
v3.0-4803-4817
v3.0-4803
v2.7-minorBugs
v3.0-privates
v2.x-logging_mem_2
v2.7_fix
v2.7_amd64_build_fix
v2.7-fix_aux_threads_ssl_leaks
v2.7-fix_ssl_params_leak
v2.7-rm_malloc_conf_on_version
v2.7_compression
v2.7-actions-add-3p-tests-parameter
none
v2.7-fix_hang_on_resume
v2.x-logging_mem
v2.7_servers_defaults
v2.7-mariadb_column_metadata_integrity_check
ssl_optimization
v2.7_reg_test_4716_single_semicolon
v2.7_issue_4707_threshold_resultset_size
v2.7_reg_test_4723_query_cache_stores_empty_result
2.7_randomized_cache_ttl
v3.0_fix_multiple_builds
v3.0_servers_defaults
v2.7-update_actions_triggers_v2
v2.7-update_actions_triggers
v2.6
v2.6.x-update_triggers
v2.6-4646
v2.7.1-update_actions
v2.x
v2.6.x-testing-global-multiplexing-disabled
use-wrlock-in-dns-cache-empty
v2.6.x-fix-darwin
v2.x-admin_list_ciphers
v2.x-sqlite3_pass_exts
v2.x-tap_tests_opt_ssl
v2.6.0-update_to_libhttpserver_v0.19
v2.x_router_2ports
v2.6.0-update_to_openssl_v3.1.5
v2.x-2411025
v2.x-profiling_poc1
v2.x_sha2pass_draft2
v2.x-webui_fixes
v2.6.0-more-makefile-fixes
v2.x-20230914_test
v2.x-20230913_test
v2.5.5-branch
v2.5.5-branch_255_patches
v2.x-aurora_autodiscovery-refactor_cluster_mysql_servers-gr_bootstrap_mode_2
v2.x_mysql_connector_j_fixes
v2.6-deprecate_old_clickhouse
v2.x_refactor_cluster_mysql_servers
v2.x-aurora_autodiscovery
v2.x-zd70545
v2.x-aurora_autodiscovery_shunned_promotion
v2.x-tap20230609
v2.x-test20230530
v2.x_sha2pass_draft2-TEST
v2.x-session_track_system_variables_v2
v2.x-status-variables-for-set-stmts
v2.x-enable_session_state_trackers
v2.x-increase-logging-eof_fast_forward-t
v2.x-3863-special-query
v2.x-session_track_system_variables
v2.x_refactor_read_only_action
v2.x_sha2pass_draft1
v2.2.0-sqliteserver_read_only
v2.x-digest_umap_aux-comparison
v2.4.8
v2.x-4105_4114
v2.x-3583-server_closed_conn
v2.x-group_replication_rework-SHUNNED_promotion
v2.1.0-var-global-multiplex
v2.x-CI-hostname-tap-test-fixes
v2.x-limit-version-check
v2.x-fix_deprecate_eof_warning
v2.x-3698
v2.x_tidb_replica_read
v2.x-HostGroups_attributes
v2.0.18.221009
v2.x-ci_reg_test_3273_ssl_con
TAP_test_restapi
v2.x-tap_tests_groups
v2.x-tap_test_sqlite3_server-t
PRS_3888_3903_2
PRS_3888_3903
v2.x_code_refactor_2206
v2.x-multipacket_poc_1
v2.x-impr_hg_latency_obsv
v2.x-gcc-warnings
v2.x-hg_lock_session_id
v2.x-3768
v2.x-3371
v2.x-ci_verifications
v2.x-thread_local_qps_limit
v2.x-parser_table
v2.1.1-3207
v2.x-qps_limits
v2.x-3711
v2.x-3642
v2.x-3674
v2.x-ssl3_warnings
V2
v2.3.2
v2.3.2_3646_3647
v2.x-client_err_limit_conn_timeout
v2.x-keep_multiplexing_regression_fix
v2.3.2-3628
v2.2.2-to-v2.3.0-7
v2.2.2-to-v2.3.0-7_merge
v2.2.2-to-v2.3.0-6
v2.2.2-to-v2.3.0-6_merge
v2.2.2-to-v2.3.0-5
v2.2.2-to-v2.3.0-4
v2.2.2-to-v2.3.0-3
v2.2.2-to-v2.3.0-2
v2.2.2-to-v2.3.0-1
v2.3.1
v2.0.14-70226
v2.3.0
v2.x-client_err_limit-gr_replication_lag_action
v2.2.2
v2.2.1-3603
v2.2.1-centos7-ASAN
v2.2.1
v2.2.1-3601
v2.2.1-3599
v2.2.1-3597
v2.2.1-3595
v2.2.0-restapi_server_exc_log
v2.x-3574
v2.x-3558
v2.2.0-3546-centos-7-gcc-8
v2.x-3549
v2.x-cluster_large_mysql_users
v2.x-cov_ci_verification
v2.0.14-tb1
v2.0.14-tb1-3494
v2.0.14-tb1-3488
v2.0.14-tb1-3117
v2.0.14-tb1-2762
v2.0.14-2762
v1.4.13-arm
v2.1.1-3296
v2.2.0
v2.0.18
v2.1.1
v2.0.18-3342
v2.0.18-3182
v2.1.1-3184
v2.1.0-revert-da7fdfe14
v2.0.18-revert-da7fdfe14
v1.4.13-70160
v2.0.18-3354
v2.0.18-3350
v2.0.14-3339
1.4.13-70160
v2.0.18-3339
v2.1.1-3317
v2.1.1-3319
v2.0.18-3317
v2.1.2-LBalgo
v2.0.18-1574
v2.1.2-hgman
v2.0.17
v2.1.0
v2.0.17-3288
v2.0.17-3276
v2.0.17-3273
v2.0.16
v2.0.16-3267
v2.0.16-3265
v2.0.16-3262
v2.0.16-3261
v2.1.1-3252
v2.1.1-collation
v2.0.16-3252
v2.0.16-collation
v2.1.0-parser
v2.0.16-3219
v2.0.16-3216
v2.0.16-3201
v2.0.16-2330
revert-3191-v2.0.16-3190
v2.0.16-3204
v2.0.16-3177
v2.0.16-2619
v2.0.16-3190
v2.0.16-3187
v2.1.0-70118
v2.0.16-3133
v2.0.16-3133_ci_verification
v2.0.16-3150
v2.0.16-change_user
v2.0.15
v2.0.15_amd64_fix
v2.0.15_arm64_packages
v1.4.14-ssl
v2.0.15_arm64
v2.1.0-2820
v2.0.15-sslbug
v2.0.15-KillTrx
v2.0.14
v2.0.14-ch_build_fix
v2.0.14-focal
v2.0.14-valgrind20200904
v2.1.0-3042
v2.0.14-3035
v2.0.14-3036
v2.0.14-2955
v2.0.14-vars
v2.0.14-3005
v2.0.14-3003
v2.0.14_2970_2979
v2.0.14-NOTSOCK
v2.1.0'
v2.0.14-2958
v1.4.10-zd
v2.0.13
v2.0.13-autocommit_fix
v2.1.0-2892
v2.0.13-2711
v2.0.13-duplicated_variables
v2.0.13-duplicated_variables_for_2.1.0
v2.0.12-deprecate_eof
v2.1.0-1377
v2.1.0-admin_queries
v2.0.12-var-global-multiplex
v2.1.0-var-foreign-key
v2.0.12
v2.0.12-tab-small-log
v2.0.12-var-foreign-key
v2.0.12-var-long-query-time
v2.0.12-galera-shunned
v2.1.0-admin_queries_2
v2.1.0-tap-rm-config
v2.0.12-tap-rm-config-test
v2.1.0-QP_stmt_3
v2.0.11-fix-multi-2-ci
v2.0.11-fix-multi
v2.0.11-266_0-3
2.1.0
v2.0.11
v2.1.0-track-vars
v2.1.0-track-variables
v2.0.11-track-variables
v2.0.11-2526
v2.0.11-tap-tests
v2.0.13-2698-commit1
v2.0.10-galera-pxc-maint-mode
v2.0.11-track-vars
v2.0.10-2647
v2.0.11-track
v2.0.11-track-session-vars
v2.0.9-var-array-review
v2.0.11-stats
v2.0.10
v2.0.10-centos67
v1.4.14.2
1.4.14.2
v1.4.14-show-warnings
v2.0.9
v2.0.9-var-array_2
v2.0.9-var-array
v1.4.16
v2.0.8
val214-changing_charset
v2.0.6
v1.4.16-1922_2
v1.4.13.2
v2.0.4-charset248
v2.0.5
v1.4.10-67841
v2.0.4
v2.0.4-sqlite327
v2.0.3
v2.0.2
v1.4.15
v2.0.1
v1.4.14
v2.0.0
v1.4.14-ping_shun
v1.4.14-1828
v1.4.14-latency_awareness
v1.4.12
v1.4.13-admin_deadlock
v2.0.0-improve_speed
v1.4.13
v1.4.13-autocommit_revert
v1.4.11.2
v1.4.13-ps
v2.0.0_bionic_deb_fix
v2_962
v1.4.12-1640
v1.4.11-names_tz
v1.4.12-1693
master
v1.4.11
v1.4.10
v1.4.6
v1.3.10
jenkins_test
v2.0.0-cachegrind
v1.4.9
v2.0-lab
v149_1511
v149_1382
v1.4.7-f2
v1.4.7-f1
v149_1491
v1.4.5-kub
v1.4.8
v2.0-web2
v1.4.3
v1.4.7
bsd_install_update
v1.4.2
v1.4.1-ch2
v1.4.1
v1.3.9
v1.4.1-ch
v1.3.8
v1.3.8-dev
v1.3.7
v1.3.7-dev
v1.3.6-dev
v1.4.0-clickhouse
v1.4.0
v1.3.6
v1.3.5
v1.3.5-dev
v1.4.0-955
v1.3.4
v1.3.4-dev
v1.3.3
v1.3.3-dev
v1.3.2
v1.3.2-dev
v1.3.2-766
v1.3.0h
v1.3.1-utf8mb4
1.4.0-840
v1.3.1
v1.2.6
v1.3.0
v1.4.0-797
v1.2.5-715
v1.2.5
v1.2.4-lowmem
v1.3.1-dev-mem
v1.2.0
connleak
lab-1.2.0
v1.1.2
T107_add_proxysql_consul_requirements
T89_write_consul_integration_doc
T98_consul_multi_table_config
mongoose
evhttp
SQLiteServer
1.0
3.0.9
3.0.8
3.0.7
3.0.6
3.0.5
3.0.4
3.0.3
3.0.2
2.7.3
2.6.6.1
3.0.1
2.7.2
3.0.0
2.6.6
2.7.1
2.7.0
2.6.5
2.6.4
2.6.3
2.6.2
2.6.1
2.5.5
2.6.0
2.5.4
2.5.3
2.5.2
2.5.1
2.4.8
2.5.0
2.4.7
2.4.6
2.4.5
2.4.4
2.4.3
2.4.2
2.4.1
2.4.0
2.3.2
2.3.1
2.3.0
2.2.2
2.2.1
2.2.0
2.0.18
2.1.1
2.0.17
2.0.16
2.0.15
2.0.14
2.0.13
2.0.12
2.0.11
2.1.0
2.0.10
2.0.9
2.0.8
2.0.7
2.0.6
2.0.5
2.0.4
2.0.3
2.0.2
1.4.16
1.4.15
2.0.1
1.4.14
1.4.13
1.4.12
1.4.11
1.4.10
1.3.10
1.4.9
2.0.0
1.4.8
1.4.7
1.4.6
1.4.4
1.4.3
1.4.2
1.3.9
1.3.8
1.4.1
1.3.7
1.4.0
1.3.6
1.3.5
1.3.4
1.3.3
1.3.2
1.3.1
1.3.0h
1.3.0g
1.3.0f
1.3.0e
1.3.0d
1.3.0c
v1.3.0b
1.4.5
v1.1.0
v1.1.0-rc
v1.1.1-beta
v1.1.1-beta.1
v1.1.1-beta.2
v1.1.1-beta.3
v1.1.1-beta.4
v1.1.1-beta.5
v1.1.1-beta.6
v1.1.2
v1.2.0a
v1.2.0b
v1.2.0c
v1.2.0d
v1.2.0e
v1.2.0f
v1.2.0g
v1.2.0h
v1.2.0i
v1.2.0j
v1.2.0k
v1.2.1
v1.2.2
v1.2.3
v1.2.4
v1.2.4.0923
v1.2.5
v1.2.6
v1.3.0
v1.3.0a
v1.3.0g
v1.3.0h
v1.3.1
v1.3.10
v1.3.2
v1.3.2-1
v1.3.3
v1.3.4
v1.3.5
v1.3.6
v1.3.7
v1.3.8
v1.3.9
v1.3.9-prev.1
v1.4.0
v1.4.1
v1.4.10
v1.4.11
v1.4.12
v1.4.13
v1.4.14
v1.4.15
v1.4.16
v1.4.2
v1.4.3
v1.4.4
v1.4.5
v1.4.6
v1.4.7
v1.4.8
v1.4.9
v2.0.0-beta.1
v2.0.0-rc1
v2.0.0-rc2
v2.0.1
v2.0.10
v2.0.11
v2.0.12
v2.0.13
v2.0.14
v2.0.15
v2.0.16
v2.0.17
v2.0.18
v2.0.2
v2.0.3
v2.0.4
v2.0.5
v2.0.6
v2.0.7
v2.0.8
v2.0.9
v2.1.0
v2.1.1
v2.2.0
v2.2.1
v2.2.2
v2.3.0
v2.3.1
v2.3.2
v2.4.0
v2.4.1
v2.4.2
v2.4.3
v2.4.4
v2.4.5
v2.4.6
v2.4.7
v2.4.8
v2.5.0
v2.5.1
v2.5.2
v2.5.3
v2.5.4
v2.5.5
v2.6.0
v2.6.1
v2.6.2
v2.6.3
v2.6.4
v2.6.5
v2.6.6
v2.7.0
v2.7.1
v2.7.2
v2.7.3
v3.0.0-alpha
v3.0.1
v3.0.2
v3.0.3
v3.0.4
v3.0.5
v3.0.6
v3.0.7
v3.0.8
v3.0.9
v3.1.6
v3.1.7
v3.1.8
v3.1.9
v4.0.6
v4.0.7
v4.0.8
${ noResults }
10020 Commits (6cdd4e697eb86982e3dfd2ceab009ead5da0efcb)
| Author | SHA1 | Message | Date |
|---|---|---|---|
|
|
6cdd4e697e |
fix: correct lock unlock order in Authentication classes
Fix lock order reversal in MySQL_Authentication, ClickHouse_Authentication, and PgSQL_Authentication. In memory_usage() and dump_all_users(), locks were acquired in order (frontends, backends) but released in the same order instead of the reverse. This creates a potential deadlock if another thread attempts to acquire the same locks in opposite order. Swap unlock calls to release backends before frontends, matching the reverse of the acquisition order. |
1 month ago |
|
|
65c522e635
|
Merge pull request #5701 from sysown/v3.0-genai-plugin
GenAI plugin carve-out: move MCP/GenAI/AI/RAG into plugins/genai/ |
1 month ago |
|
|
54844df0bb
|
Merge branch 'v3.0' into v3.0-genai-plugin
|
1 month ago |
|
|
40ee836fc0
|
Merge pull request #5717 from sysown/feature/mysqlx-stack-consolidated
feat(mysqlx): consolidated MySQL Router parity work + observability + behavioural validation + ASAN/TSAN plumbing |
1 month ago |
|
|
99ccfc766a
|
Merge branch 'v3.0' into v3.0-genai-plugin
|
1 month ago |
|
|
6f2b69d2eb |
test(mysqlx): align unit tests with new variable + response-state contracts
Two tests that the rebase onto v3.0 surfaced as failing under ASAN-coverage CI. Both are real test/code drift introduced by earlier commits in this stack, not pre-existing baseline issues. mysqlx_admin_commands_unit-t (test 24) Commit |
1 month ago |
|
|
960eeab8d2 |
feat(mysqlx): wire per-route tls_mode through handler_capabilities_set entry path
PR #5709 landed the splice mechanics for tls_mode='passthrough' plus the per-route tls_mode column on mysqlx_routes, but no code consulted the route's tls_mode to actually drive the session into X_PASSTHROUGH_FORWARD from real client traffic — a route configured as `tls_mode='passthrough'` behaved identically to `'inherit'`. This commit closes the gap (issue #5710): (1) Advertise gating in send_capabilities() ----------------------------------------- A new helper, MysqlxSession::effective_route_tls_mode(), reads listener_route_name_ + the thread's MysqlxConfigStore and returns the per-route tls_mode (or `inherit` when listener route is empty / config store is unwired — preserving historical behaviour for tests and unconfigured deployments). send_capabilities() now suppresses the `tls` capability from the advertised set when route_tls_mode == disabled. Other modes (inherit / preferred / required / passthrough) advertise TLS the same way as before — passthrough MUST advertise so the client even thinks to upgrade. (2) Symmetric refusal in handler_capabilities_set() ------------------------------------------------ A client that sends CapabilitiesSet(tls=true) on a disabled-mode route is refused with X-Protocol error 5052 ("TLS is not enabled on this route"). Symmetric with the advertise gate; we never told the client TLS was available, so accepting it would be a silent policy bypass. (3) Passthrough entry from handler_capabilities_set() -------------------------------------------------- When CapabilitiesSet(tls=true) lands on a passthrough-mode route: a. resolve_passthrough_backend_target() picks the endpoint from the route's destination_hostgroup (no identity_ — passthrough authenticates end-to-end); b. the original CapabilitiesSet frame bytes are buffered in passthrough_pending_capset_frame_ for verbatim forwarding; c. tls_mode_ flips to TLS_PASSTHROUGH and status_ to the new X_PASSTHROUGH_BACKEND_CONNECTING state. (4) X_PASSTHROUGH_BACKEND_CONNECTING handler ----------------------------------------- handler_passthrough_backend_connecting() drives the four-step sequence: 1. allocate / pick up backend_conn_, start non-blocking TCP connect; 2. poll check_connect() to completion; 3. write the buffered CapabilitiesSet bytes verbatim to the backend (with EAGAIN/partial-write retries); 4. read exactly one X-Protocol frame from the backend (the LAST X-Protocol parse this session does); on Ok forward to the client and transition to X_PASSTHROUGH_FORWARD; on Error propagate to the client and close. The handler is registered both in the early fast-path branch of MysqlxSession::handler() (so the X-Protocol read on client_ds_ is skipped — the client's next bytes are the TLS ClientHello which is not parseable as an X frame) and in the main dispatch switch. Tests (test/tap/tests/unit/mysqlx_session_unit-t.cpp, +11 ok()s): * test_route_tls_mode_disabled_no_tls_in_advertise: drives CapabilitiesGet on a tls_mode='disabled' route, parses the response, asserts the advertised set has no `tls` capability. * test_capabilities_set_tls_refused_on_disabled_route: drives CapabilitiesSet(tls=true) on the same route, asserts session becomes unhealthy and the client receives a Mysqlx::Error. * test_route_passthrough_full_entry_path: end-to-end exercise. Stands up a loopback TCP listener as the "backend"; configures a passthrough route pointing at the listener; drives CapabilitiesGet -> CapabilitiesSet(tls=true); asserts the proxy forwards the CapabilitiesSet bytes verbatim, transitions through X_PASSTHROUGH_BACKEND_CONNECTING into X_PASSTHROUGH_FORWARD on the backend's Ok response, and stays healthy. Plan count: 87 -> 98 (after Fix B) -> 109. Closes #5710. |
2 months ago |
|
|
b7c5a08b96 |
feat(mysqlx): backlog and resume EAGAIN'd writes in passthrough splice
Previously, the passthrough splice loop's pump_one_direction helper
treated EAGAIN/EWOULDBLOCK on write() as fatal — the session
transitioned to X_SESSION_CLOSING and the connection was dropped. In
practice this turned any transient destination back-pressure (slow
client, slow backend, kernel send-buffer drained more slowly than the
proxy reads from the source side) into a connection drop. End-to-end
encrypted sessions (the whole point of tls_mode='passthrough') would
RST mid-stream under bursty load.
Fix: per-direction write backlog, drained before the next read.
* Add MysqlxSession::passthrough_c2b_backlog_ and
passthrough_b2c_backlog_ — std::vector<uint8_t> buffers for
bytes that read() from the source side could not be immediately
flushed to the destination side. Cleared on init() / reset().
* handler_passthrough_forward() now runs a drain pass over the
backlog BEFORE the read pass. drain_backlog() loops on write(),
EAGAIN means "not now, leave it for the next tick"; any other
write error fails the session.
* On a partial-write inside the read pass, the unwritten tail is
appended to the backlog (append_to_backlog) and the read pass
yields. A future pump tick (driven by either the libev EV_READ
wakeup on the source or the buffered-work re-arm via
`to_process = true`) drains the backlog and resumes reading.
* Backlog cap: 1 MiB per direction
(PASSTHROUGH_BACKLOG_CAP). Above the cap, append_to_backlog
refuses and the session is killed (X_SESSION_CLOSING) — slow-
consumer DoS protection. The drain-first contract limits the
backlog organically to BURST_BYTES (64 KiB), so the cap is
purely defensive against a future logic bug or a larger burst.
* to_process = true on a non-empty backlog so the outer dispatch
loop re-enters us on the next tick rather than waiting for a
new fd-readable event on the source — without this, a long
stall on the destination side could let the backlog grow on
each new source byte before the previous backlog was drained.
Tests (test/tap/tests/unit/mysqlx_session_unit-t.cpp):
* test_passthrough_eagain_backlog_drains_across_ticks: drives
256 KiB through a backend leg with SO_SNDBUF/RCVBUF shrunk to
4 KiB so write() returns EAGAIN early and often. Asserts
session stays healthy in X_PASSTHROUGH_FORWARD across the
repeated EAGAIN events; all 256 KiB are eventually delivered;
no byte-level corruption.
* test_passthrough_backlog_cap_kills_session: uses the
MYSQLX_TEST_BUILD-only seed_passthrough_c2b_backlog_for_test
+ try_append_to_passthrough_c2b_backlog_for_test helpers to
drive the cap branch directly. Asserts within-cap append is
accepted, over-cap append is refused, and the session
transitions to X_SESSION_CLOSING with healthy=false.
Plan count moves from 87 to 98.
|
2 months ago |
|
|
e855ba37c8 |
fix(mysqlx): decode backend TLS error code before falling back to plaintext (preferred mode)
Previously, when a session was in `preferred` TLS mode (try TLS, fall
back to plaintext on Error) and the backend responded with ANY
Mysqlx::Error to the client's CapabilitiesSet(tls=true), the code
silently dropped TLS and proceeded plaintext. Non-TLS errors
("internal server error", "out of memory", "permission denied", etc.)
were therefore swallowed and the auth flow proceeded against a backend
that just told us it was unhealthy — masking real failures and
encouraging brittle deployments.
The upstream MySQL X client at plugin/x/client/xsession_impl.cc gates
the same fallback exactly on `ER_X_CAPABILITIES_PREPARE_FAILED` (5001),
which is the only code that the X plugin's `Capability_tls::set_impl`
emits when the server has no SSL context (see
plugin/x/src/capabilities/handler_tls.cc — code 5001 is what
`ngs::Error(ER_X_CAPABILITIES_PREPARE_FAILED, ...)` produces). Mirror
that policy here:
* Parse the Mysqlx::Error body's `code` field.
* Fall back to plaintext only when the code is exactly 5001.
* Any other code (or a code-less / unparseable Error body) is fatal —
transition to BACKEND_AUTH_ERROR and return -1.
The existing `preferred-mode fallback` unit test (which already injects
code 5001) still passes. Two new tests cover the new gate:
* preferred-mode + non-TLS error code 1045 (Access denied): no
fallback, auth_state=ER, rc=-1.
* preferred-mode + Error frame with no decodable code (empty body):
no fallback, auth_state=ER, rc=-1.
The pre-existing required-mode test (no fallback regardless of code) is
unchanged.
|
2 months ago |
|
|
e4908a1df6 |
fix(mysqlx): address reviewer feedback (transaction safety, fail-closed TLS, hostgroup refresh, status string)
Four reviewer-flagged issues from CodeRabbit + Gemini on the
consolidated mysqlx stack (originally raised on PRs #5704, #5707,
#5709), all addressed in one place since this is the consolidation
branch:
1. SQLite transaction safety in stats projections.
`MysqlxStatsStore::flush_to_sqlite` and
`mysqlx_populate_stats_processlist` previously did a bare DELETE
followed by a per-row INSERT loop. A transient SQLite error in
any INSERT left the projection table empty, which is far more
misleading to operators than stale-but-recent rows. Wrap both in
BEGIN/DELETE/INSERT/COMMIT with explicit ROLLBACK on any failure;
on rollback, the previous projection stays in place.
2. Fail-closed when backend TLS is required but no SSL_CTX is
available. The earlier code in handler_connecting_server had
`if (desired_backend_tls) { if (ctx) { /* set up TLS */ } }` —
the inner `if (ctx)` was a guard with no else-branch, so a
missing SSL_CTX silently produced a plaintext backend connection
in TLS-required and AsClient-on-TLS-frontend scenarios. Reject
the connect with X-Protocol error 2026 ("Backend TLS required
but no SSL context configured on this worker") instead. Caught
by CodeRabbit on PR #5707.
3. Stale destination_hostgroup in stats rows. `MysqlxStatsStore::
get_or_create` only set `destination_hostgroup` on first insert.
If a route was rebound to a different hostgroup via LOAD MYSQLX
ROUTES TO RUNTIME, subsequent traffic continued reporting the
first-seen hostgroup forever. Refresh the hostgroup field on
every lookup; counters are not reset (only metadata is updated).
4. session_status_to_string missing X_PASSTHROUGH_FORWARD case.
`Mysqlx_Thread::session_status_to_string` enumerated every
MysqlxSession::Status except the new X_PASSTHROUGH_FORWARD,
which fell through to the "UNKNOWN" default. The new state was
added in the TLS passthrough work (commit
|
2 months ago |
|
|
352455d79c |
test(mysqlx): free fixture allocations leaked under LeakSanitizer
Closes #5703. Phase 1 of the ASAN sanitizer pass on PR #5651 surfaced two test-side leaks: 1. mysqlx_admin_commands_unit-t.cpp:210 — the SQLite3_result* returned by execute_statement was wrapped in a unique_ptr with a custom no-op deleter, with the comment "leaked intentionally for test scope". The "intentionally" was test-author convenience, not a real reason — the default unique_ptr<SQLite3_result> deleter calls ~SQLite3_result(), which the type supports. Drop the no-op deleter. 2. mysqlx_message_dispatch_unit-t.cpp::test_connection_pool_matching — two MysqlxConnection* allocations (c1 at line ~551, c2 at line ~566) are inserted into the per-thread cache and then extracted via get_connection_from_cache(). Extraction transfers ownership to the caller (the cache erases the entry); the test never re- pools or deletes them, so they leak. Add explicit `delete found; delete f2;` at end of test with a comment explaining the ownership transfer. Verified locally under ASAN with detect_leaks=1: both tests now report 0 LeakSanitizer findings. The pre-existing failure of test 24 in mysqlx_admin_commands_unit-t ("mysqlx_variables has 4 rows after save (all known variables)") is unrelated to this PR — it predates the parity-cleanup branch and exists on parent. |
2 months ago |
|
|
b340da9ab6 |
test(mysqlx): add behavioural TAP scaffolding for SIGTERM mid-traffic
Issue #5678 part (a) asks operators to demonstrate that an X-Protocol client connected to ProxySQL during SIGTERM receives a clean Mysqlx::Error frame with code 1053 ("Server is shutting down") rather than a TCP RST. The contract is: Mysqlx_Thread::run() -> for each session: MysqlxSession::shutdown_notify_client() -> send_error(1053, "Server is shutting down", fatal=true) -> client_ds_.write_to_net() -> if TLS: SSL_set_quiet_shutdown(1) + SSL_shutdown() (plugins/mysqlx/src/mysqlx_session.cpp:1875, plugins/mysqlx/src/mysqlx_thread.cpp:120-128). Why this is scaffolding, not an automated test: ProxySQL runs in its own Docker container under test/infra/control/run-tests-isolated.bash. Tests run in a separate test-runner container that does NOT have docker socket access, so it cannot kill -TERM the proxysql container. Even if it could, doing so mid-test would tear down the infrastructure that the rest of the TAP group expects to remain up. The harness has no "test that owns proxysql lifecycle" mode and adding one is out of scope. The equivalent automated path already exists out-of-band: test/scripts/mysqlx/behavioral_validation.py --scenario sigterm which (a) opens N X-Protocol sessions via mysql-connector-python, (b) os.kill(pid, SIGTERM)s the proxysql process directly, and (c) verifies each client's exception carries errno=1053 (Mysqlx shutdown frame), not a generic OperationalError-without-errno (TCP RST). It is invoked manually against staging or local-loop infrastructure where proxysql termination is acceptable. What this binary does: - Compiles + links, so groups.json registration exercises its existence on every CI run alongside the rest of the mysqlx-soak group; future drift in the link line or TAP harness shows up here, not at "we never built this". - At runtime, defaults to skip_all() with a pointer to the behavioral_validation.py script and the manual procedure documented in the file's header comment. - With MYSQLX_SIGTERM_INFLIGHT_OPT_IN=1 set, the binary refuses loudly (fails with a planned ok(false, ...)) rather than silently doing nothing, so an operator who flips the env var without first wiring up an automated body gets a clear signal. - Header comment includes the pseudocode for the future automated body so a follow-up PR can lift it directly. Wired into mysqlx-soak-g1 alongside the other mysqlx behavioural tests; the skip_all keeps CI green while the registration ensures the binary is built and the test name is well-known. Build: WITHASAN=1 NOJEMALLOC=1 PROXYSQLGENAI=1 make test_mysqlx_sigterm_inflight-t Verified that the binary skip_alls correctly when MYSQLX_SIGTERM_INFLIGHT_OPT_IN is unset: $ ./test_mysqlx_sigterm_inflight-t 1..0 # skip manual procedure -- see header comment. ... |
2 months ago |
|
|
9e6243026f |
test(mysqlx): add behavioural TAP test for LOAD MYSQLX ROUTES TO RUNTIME mid-traffic
Demonstrates issue #5678 part (b) end-to-end against a real ProxySQL instance with the mysqlx plugin loaded. The test: 1. Opens 5 X-Protocol clients to ProxySQL via route r1 and dispatches SELECT 1 on each so the session is past handshake/routing. 2. Connects to the admin port (classic protocol via libmariadbclient) and runs: DELETE FROM mysqlx_routes WHERE name='r1'; LOAD MYSQLX ROUTES TO RUNTIME; 3. Asserts each in-flight session can still execute SELECT 1 -- the contract from mysqlx_listener_reconcile.cpp::remove_listener_for_route ("in-flight sessions are NOT torn down on route removal; they continue against their already-resolved target_hostgroup_/target_address_/target_port_") matching MySQL's "DROP TABLE doesn't cancel in-flight queries" semantics. 4. Asserts a NEW TCP connect to the dropped route's port is refused (Mysqlx_Thread::remove_listener_for_route close()d the listener fd). 5. Restores the route via INSERT + LOAD MYSQLX ROUTES TO RUNTIME so downstream tests in the same group are not disrupted. Wired into the mysqlx-soak-g1 TAP group, which is the only group that provisions route r1 + user alice in ProxySQL (mysqlx-e2e-g1 uses SKIP_PROXYSQL=1 against a dbdeployer sandbox so the route doesn't exist there). Runs through the standard isolated docker harness (test/infra/control/run-tests-isolated.bash); requires no new infrastructure beyond what mysqlx-soak/setup-infras.bash already provisions. The test issues skip_all() if the X-Protocol listener is unreachable, which keeps it inert in groups that don't bring up the route-r1 fixture and on bare workstations without infrastructure. Build: WITHASAN=1 NOJEMALLOC=1 PROXYSQLGENAI=1 make test_mysqlx_route_drop_inflight-t Reuses the protocol helpers from plugins/mysqlx/src/mysqlx_protocol.cpp and the protobuf objects from plugins/mysqlx/proto/, identical to the existing test_mysqlx_e2e_*-t binaries. |
2 months ago |
|
|
bd906167fb |
fix(mysqlx): place NOSONAR(cpp:S4423) on the same line as TLS_method()
SonarCloud's NOSONAR annotation only suppresses when it appears on the same source line as the rule trigger; preceding comment blocks don't count. The previous attempt put the rationale in a 5-line block comment above the SSL_CTX_new call, which SonarCloud ignored — quality gate stayed red on PR #5711 / #5713 / #5714 because the S4423 vulnerability finding still landed. Move the rationale into the function-level doc comment and put a short `// NOSONAR(cpp:S4423)` trailer on the SSL_CTX_new line itself. That's the syntactic shape SonarCloud's parser actually recognizes. |
2 months ago |
|
|
8566d93df9 |
fix(mysqlx): suppress SonarCloud S4423 false positive on TLS_method() in classifier test
The cpp:S4423 rule flags TLS_method() as a 'weak protocol' constructor. That was true for SSLv23_method() — TLS_method() is the OpenSSL 1.1+ recommended replacement and defaults to TLS 1.2+. Protocol-version floor is set via SSL_CTX_set_min_proto_version where the test runs real handshakes (e.g. create_test_ssl_ctx at line 64 sets TLS1_2_VERSION). The classifier test fixture in make_synthetic_ssl (line 292) never runs a handshake — it stages SSL_set_verify_result state and feeds the SSL* directly to the classifier under test. Version negotiation is not exercised, so a min_proto_version setter would be cargo-cult. Rather than introduce a no-op call, suppress the false positive with NOSONAR + a comment explaining why. This was the lone VULNERABILITY on PR #5711's SonarCloud report; with it suppressed, new_security_rating drops from 4 (D) to 1 (A) and the quality gate flips green. |
2 months ago |
|
|
0ccf3615f1 |
fix(mysqlx): classify backend TLS handshake failures into specific error codes
Closes #5698 (P3 — meaningful TLS error messages on backend failures). Background: prior to this commit, backend TLS handshake failures all emitted a single generic "Backend TLS handshake failed" with code 3152; frontend TLS failures all emitted "TLS handshake failed" code 3151. Operators debugging TLS issues had to attach with `openssl s_client` or run the proxy under SSL_TRACE / SSLKEYLOGFILE to figure out whether the underlying cause was an expired cert, a hostname mismatch, an untrusted CA, or a protocol-version mismatch. MySQL Router translates each of these into a distinct X-Protocol error code and shortcuts the debug session. Implementation: 1. New MysqlxTlsErrorClass enum (HANDSHAKE_FAILED, CERT_VERIFY_FAILED, CERT_EXPIRED, HOSTNAME_MISMATCH, PROTOCOL_MISMATCH, UNKNOWN_CA, NO_SSL_CTX, UNKNOWN). Lives in mysqlx_protocol.h alongside the per-class X-Protocol error code constants. 2. New mysqlx_classify_tls_error(SSL*, peek_err_queue) helper. Classification logic in order: a. SSL == nullptr -> NO_SSL_CTX b. SSL_get_verify_result() != X509_V_OK -> chain class (CERT_EXPIRED for expired/not-yet-valid; HOSTNAME_MISMATCH; UNKNOWN_CA for self-signed-in-chain or unable-to-get-issuer; CERT_VERIFY_FAILED for everything else cert-chain) c. ERR_get_error() walked for SSL_R_UNSUPPORTED_PROTOCOL / TLSV1_ALERT_PROTOCOL_VERSION / WRONG_VERSION_NUMBER / UNKNOWN_PROTOCOL -> PROTOCOL_MISMATCH d. Fallback -> HANDSHAKE_FAILED Cert-chain reasons take precedence because the OpenSSL queue sometimes carries both, and the chain reason is more actionable. 3. Backend codes (5+ distinct, 3152-3157): 3152 BACKEND_TLS_ERR_HANDSHAKE_FAILED (was: only existing code) 3153 BACKEND_TLS_ERR_CERT_VERIFY_FAILED (NEW) 3154 BACKEND_TLS_ERR_CERT_EXPIRED (NEW) 3155 BACKEND_TLS_ERR_HOSTNAME_MISMATCH (NEW) 3156 BACKEND_TLS_ERR_PROTOCOL_MISMATCH (NEW) 3157 BACKEND_TLS_ERR_UNKNOWN_CA (NEW) Backend messages name the OpenSSL reason in operationally-useful terms ("certificate hostname mismatch") but do NOT include the raw OpenSSL queue string in the wire frame — that is logged to stderr separately for the operator's benefit. 4. Frontend codes (3 distinct): 3150 FRONTEND_TLS_ERR_NOT_CONFIGURED (existing — NO_SSL_CTX) 3151 FRONTEND_TLS_ERR_HANDSHAKE_FAILED (existing — every other class) 3158 FRONTEND_TLS_ERR_PROTOCOL_MISMATCH (NEW — operationally useful for legitimate clients hitting a too-old/too-new TLS version) Frontend collapses CERT_*/HOSTNAME_MISMATCH/UNKNOWN_CA onto HANDSHAKE_FAILED specifically to avoid leaking attacker-supplied cert info into the response (asymmetric threat model — the frontend client may be the attacker). 5. New MysqlxConnection::tls_error_class_ member + accessors. Set by step_auth_tls_handshake() at the failure site (the OpenSSL error queue is thread-local FIFO and must be drained while fresh; we can't defer the classification to the session). Read by the session's BACKEND_AUTH_ERROR branch in handler_connecting_server when emitting send_error(). 6. Frontend handler_tls_accept_init() also runs the classifier and emits via the frontend code/message helpers. Logs the OpenSSL queue to stderr (operator-side only). Tests (in mysqlx_tls_unit-t): - test_classify_null_ssl: nullptr -> NO_SSL_CTX (1 ok) - test_classify_cert_expired_via_verify_result (1 ok) - test_classify_hostname_mismatch_via_verify_result (1 ok) - test_classify_unknown_ca_via_verify_result: 2 sub-cases (UNABLE_TO_GET_ISSUER + SELF_SIGNED_IN_CHAIN) (2 ok) - test_classify_generic_cert_verify_failed: SIGNATURE_FAILURE -> generic (1 ok) - test_classify_handshake_failed_default (1 ok) - test_classify_code_message_round_trip_backend: 7 classes * 2 (msg + code-range) + 1 distinct-codes assertion (15 ok) - test_classify_code_message_round_trip_frontend: collapse + 3 distinct-code asserts (4 ok) The cert-fixture-driven tests (real expired/hostname-mismatched/ self-signed cert chains) are explicitly punted per the issue's "don't generate cert fixtures in this PR" guidance. The classifier accepts SSL_set_verify_result-staged synthetic state, which exercises the same code paths as a real cert failure (since the only thing the classifier reads off SSL is the verify_result long); a follow-up issue covers wiring an end-to-end TAP test against a fixture-driven backend. Build: NOJEMALLOC=1 WITHASAN=1 PROXYSQLGENAI=1 plugin .so + build_tap_test_debug all green. Pre-existing RSA_new deprecation warnings unchanged. Tests: mysqlx_tls_unit-t (44/44, was 18 — +26 from 8 new tests). Other suites unchanged. ASAN-clean. |
2 months ago |
|
|
767f808309 |
fix(mysqlx): mark post-Session::Reset connections non-cacheable
Closes #5697 (P3 — Session Reset pool invalidation). Background: X-Protocol's Session::Reset frame asks the server to wipe session state (current schema, isolation level, charset, prepared statements, session vars) without reauthenticating. ProxySQL forwards the frame and dispatches the backend Ok response correctly — but until this commit, the connection was returned to the per-thread cache as a regular IDLE entry afterwards. The cache key (hostgroup, user, schema, tls_active) doesn't capture session-state-version, so a subsequent reuse from the same identity could pick up the post-reset connection and silently inherit blank state instead of the per-identity defaults. The pool-leak scenario in practice: - Client A issues Session::Reset on backend B. - Backend B is returned to the per-thread cache as IDLE. - Client A2 (same user/schema/hostgroup/tls posture) next request pulls B from the cache. - Client A2 sees blank session state, even though it expected the per-identity defaults a fresh-auth connection would provide. MySQL Router treats Session::Reset as pool-terminating; this commit brings ProxySQL in line. Implementation: - New MysqlxConnection::needs_post_reset_rehandshake_ bool member + accessor pair (set/get). Default false. - is_reusable() returns false when the flag is set, so Mysqlx_Thread::return_connection_to_cache deletes the connection instead of pooling it. - reset() defensively clears the flag too. Production path doesn't rely on this (the cache deletes non-reusable conns instead of resetting them), but the invariant matters for any future code path that calls reset() directly (e.g. retry-on-error). - handler_session_reset_waiting() sets the flag on the Mysqlx.Ok branch — the only path where Session::Reset succeeded. The Error branch already marks the connection non-reusable for unrelated reasons (the Reset itself failed), so no change needed there. We do NOT implement the rehandshake path itself in this commit; the simpler "drop on reset" semantic matches Router's behaviour and is strictly safer than the pre-fix "silently pool blank state". Tests: - mysqlx_connection_unit-t::test_connection_post_reset_rehandshake_flag asserts the flag's defaults, set/get round-trip, is_reusable() interaction, and reset() defensive-clear behaviour (6 ok()). - mysqlx_message_dispatch_unit-t::test_dispatch_sess_reset_marks_non_cacheable drives the full SESS_RESET → backend-Ok → return-to-pool flow with a fake backend and asserts the connection is non-cacheable afterwards. Strengthens the existing test_dispatch_sess_reset which only proved the dispatch reached the backend (5 ok() — pre-flag/state, post-dispatch status, post-condition observed via backend_conn being deleted on the non-reusable path). - mysqlx_connection_unit-t plan switched to plan(0) so future additions don't require re-counting. Build: NOJEMALLOC=1 WITHASAN=1 PROXYSQLGENAI=1 plugin .so + build_tap_test_debug all green, no compile warnings. Tests: mysqlx_connection_unit-t (16/16, was 10), mysqlx_message_dispatch_unit-t (114/114, was 109). Other suites unchanged. ASAN-clean. |
2 months ago |
|
|
31a3934014 |
fix(mysqlx): explicit auth-phase notice forwarding policy in step_auth
Closes #5695 part 2 (P2 — explicit per-state policy for backend NOTICE frames during the backend auth handshake; data-plane validation landed in the previous commit). Background: prior to this commit, MysqlxConnection::read_auth_frame() silently drained ALL backend NOTICE frames during the BACKEND_AUTH_* state machine. The drain was needed (MySQL backends commonly emit a SESSION_STATE_CHANGED notice before AuthenticateContinue / Ok, and returning nullopt on a NOTICE caused auth to spin until the 10s handshake timeout) but it was indiscriminate — a malformed/unknown-type NOTICE would be drained as silently as a legitimate one. This commit adds an explicit per-state policy: - New helper auth_phase_notice_is_drainable(body, body_len). Parses the NOTICE as a Mysqlx::Notice::Frame and applies a per-type decision: WARNING / SESSION_VARIABLE_CHANGED / SESSION_STATE_CHANGED / GROUP_REPLICATION_STATE_CHANGED / SERVER_HELLO -> drain malformed / empty / unknown enum value -> fail auth WARNING and GROUP_REPLICATION_STATE_CHANGED are also logged on the drain path: WARNING during auth typically signals a server-side misconfig (deprecated auth method, etc.); GROUP_REPLICATION_* during auth is operationally out-of-place (cluster-membership notices belong on data-plane connections, not handshakes). Both are drained to preserve compatibility with over-eager backends but surfaced for operator triage. - Wired into read_auth_frame() between the MAX_LEADING_NOTICES cap and the type==NOTICE branch. On a fail-auth result, the helper has already set auth_state_=BACKEND_AUTH_ERROR and logged; the caller propagates std::nullopt and step_auth fails the connection. - Frontend forwarding during auth: explicitly NEVER allowed. The frontend client has no context to interpret a backend NOTICE before it sees AuthenticateOk; surfacing them would also leak server-side state mid-handshake (the load-bearing concern in issue #5695). The proxy terminates ALL backend NOTICEs on the backend leg during the backend auth phase — even legitimate ones. - Test-only hooks under MYSQLX_TEST_BUILD: a public auth_phase_notice_is_drainable_for_test() and a set_auth_state_for_test() so unit tests can drive the per-type decision matrix directly without running the full step_auth state machine. Tests (in mysqlx_backend_auth_unit-t): - test_auth_phase_notice_known_types_drained: all five spec types are drainable and don't perturb auth_state_ (5*2=10 ok()). - test_auth_phase_notice_unknown_type_fails_auth: type=99 fails auth and sets BACKEND_AUTH_ERROR (2 ok()). - test_auth_phase_notice_malformed_fails_auth: garbage protobuf bytes fail auth (2 ok()). - test_auth_phase_notice_empty_fails_auth: empty body fails auth (2 ok()). - Switched the existing plan(42) to plan(0) so future additions don't require re-counting; existing test_backend_auth_notice_skip (which uses Frame_Type_WARNING) continues to pass under the new policy because WARNING is still on the drainable list. Build: NOJEMALLOC=1 WITHASAN=1 PROXYSQLGENAI=1 plugin .so + build_tap_test_debug all green, no compile warnings. Tests: mysqlx_backend_auth_unit-t (58/58, was 42 — +16 from the 4 new tests), other suites unchanged. ASAN-clean. |
2 months ago |
|
|
6ef8cf3f1f |
fix(mysqlx): validate Mysqlx::Notice::Frame::type before forwarding
Closes #5695 part 1 (P2 — explicit notice forwarding awareness; auth-phase per-state policy is the next commit; per-notice metric remains under #5691 follow-up scope). Background: X-Protocol NOTICE frames are non-terminal informational messages a backend can emit at essentially any state transition (warnings, session-state changes, generated-doc-id notifications, group-replication membership changes, etc.). Prior to this commit the proxy forwarded NOTICE frames uncritically; a buggy or hostile backend (or an MITM that bypassed TLS) could ship a NOTICE frame with an unknown `type` enum value and confuse a strict client. The risk is bounded — info disclosure, no auth bypass — but it's unhardened territory MySQL Router handles explicitly. This commit adds a per-frame validation hook on the data plane: - New MysqlxSession::is_notice_frame_valid(body, body_len). Pure query — no session-state mutation. Parses the body as a Mysqlx::Notice::Frame and verifies the outer `type` field is in the spec range (1..5: WARNING, SESSION_VARIABLE_CHANGED, SESSION_STATE_CHANGED, GROUP_REPLICATION_STATE_CHANGED, SERVER_HELLO) using the protoc-generated Frame_Type_IsValid(). Empty body, malformed protobuf, missing required `type` field, and out-of-range enum values all return false. - Wired into handler_waiting_server_msg() and handler_session_reset_waiting() before forwarding NOTICE to the client. Invalid notices are dropped with a stderr log line tagged with route+hostgroup+body_len for operator triage; the response sequence continues (NOTICE is non-terminal in every state). - Test-only hook is_notice_frame_valid_for_test() exposed under MYSQLX_TEST_BUILD so unit tests can drive the predicate directly with synthetic bodies without setting up a fake backend. Tests (in mysqlx_message_dispatch_unit-t): - test_notice_validation_known_types_accepted: all five spec types pass (5 ok()). - test_notice_validation_unknown_type_rejected: types 0, 99, and 100000 are rejected (3 ok()). - test_notice_validation_empty_body_rejected: nullptr body and zero-length body both rejected (2 ok()). - test_notice_validation_malformed_protobuf_rejected: garbage bytes that fail ParseFromArray are rejected (1 ok()). We deliberately do NOT validate the inner `payload` bytes — that's a type-specific protobuf the client parses, and the proxy has no business reaching into it. The outer `type` is the load-bearing field for client-side branching, so that's where we focus. Build: NOJEMALLOC=1 WITHASAN=1 PROXYSQLGENAI=1 make build_lib + plugin .so + build_tap_test_debug all green. Tests: mysqlx_session_unit-t (87/87), mysqlx_message_dispatch_unit-t (109/109, was 98 — +11 from the 4 new tests), mysqlx_compression_unit-t (64/64), mysqlx_tls_unit-t (18/18), mysqlx_thread_unit-t (25/25), mysqlx_concurrent_unit-t (6/6). All ASAN-clean. |
2 months ago |
|
|
9ea2b31bf5 |
fix(mysqlx): match upstream X-Protocol error code for compression-without-algorithm
Closes #5696 (P2 — MySQL Router parity gap, compression error code). Before this change the mysqlx plugin emitted error code 5008 for every compression-related failure ("Compression frame received without negotiated algorithm", parse failures, decompression failures, etc.). That code does not match upstream MySQL X plugin: 5008 in plugin/x/src/xpl_error.h is ER_X_BAD_CONNECTION_SESSION_ATTRIBUTE_TYPE — a totally unrelated session-attribute error. A client written specifically against the upstream X-Protocol error contract would see the wrong error class entirely. Authoritative source for the canonical codes: plugin/x/src/xpl_error.h in the MySQL 8.4 source tree (deps/mysql-connector-c-8.4.0/.../xpl_error.h in this repo). Mapping: - 5170 ER_X_FRAME_COMPRESSION_DISABLED — compression frame received when the client did not negotiate compression. Upstream message: "Client didn't enable the compression." Reproduced verbatim. - 5174 ER_X_BAD_COMPRESSED_FRAME — structural problem with the Compression envelope (empty body, malformed protobuf, bogus uncompressed_size hint, decompressed payload that doesn't reframe into valid X messages). - 5171 ER_X_DECOMPRESSION_FAILED — algorithm-side failure (lz4/zstd error, OOM, stall, decompressed payload exceeds cap). - 5000 ER_X_BAD_MESSAGE — server-direction compression on the client→server path; treated as a wrong-direction message rather than a compression-specific failure. The pre-auth capability replay-cap error (also previously emitting 5008) is a ProxySQL-specific guardrail with no upstream analogue and is left untouched in this commit — the parity fix is scoped to the genuine compression error sites. Test updates: - mysqlx_message_dispatch_unit-t::test_dispatch_compression_rejected: asserts 5170 (was 5008). - mysqlx_compression_unit-t: oversize/garbage rejections assert 5171, no-negotiation rejection asserts 5170, "no error frame" tests accept any of 5170/5171/5174 (renamed got_5008 → got_compression_err). - test_compression_without_negotiation_still_5008 → test_compression_without_negotiation_still_5170. Build: NOJEMALLOC=1 WITHASAN=1 PROXYSQLGENAI=1 make build_lib + plugin .so + build_tap_test_debug all green. Tests: mysqlx_session_unit-t (87/87), mysqlx_message_dispatch_unit-t (98/98), mysqlx_compression_unit-t (64/64), mysqlx_tls_unit-t (18/18), mysqlx_thread_unit-t (25/25), mysqlx_concurrent_unit-t (6/6) — all ASAN-clean. |
2 months ago |
|
|
7153ac3193 |
docs(mysqlx): document tls_mode='passthrough' + Router parity matrix update
Documents the per-route TLS passthrough mode added by issue #5692 and flips the corresponding row in the MySQL Router parity matrix from "P1 gap" to "implemented". doc/mysqlx/README.md: * Adds the `tls_mode` column to the `mysqlx_routes` schema reference in §4.3. * Adds a per-route override subsection to §8.1 (Frontend TLS Modes) documenting all five values (inherit, disabled, preferred, required, passthrough) and explaining the inherit -> deployment-wide `mysqlx_tls_mode` fallback. * Adds a new §8.4 (End-to-end TLS Passthrough) covering the use case (compliance / cert-and-SNI preservation), the operator trade-offs (no pooling, no multiplexing, no per-query routing, no frame-level observability — bytes only), and a worked example. doc/mysqlx/MYSQL_ROUTER_PARITY.md: * Promotes the TLS-modes / TLS-passthrough rows in the comparison table from "No" to "Yes via mysqlx_routes.tls_mode='passthrough'". * Updates the TLS Architecture narrative to call out the third configuration handle (per-route override) alongside the two deployment-wide variables, and adds a paragraph describing the X_PASSTHROUGH_FORWARD splice path. * Strikes through "P1 TLS passthrough" in the Feature Gaps table and adds an implementation reference. * Updates the Summary section to note that all five Router TLS modes are now matched. |
2 months ago |
|
|
2e7e532050 |
feat(mysqlx): X_PASSTHROUGH_FORWARD session state — raw byte splice
Implements the data-plane half of the per-route TLS passthrough mode (issue #5692). Once a session enters this state the proxy stops parsing X-Protocol frames; bytes are read from one side and written to the other verbatim using read(2)/write(2). Used cases: end-to-end TLS where operator policy forbids proxy MITM (compliance, original cert/SNI/ALPN preservation). Session machine additions: * `MysqlxSession::Status::X_PASSTHROUGH_FORWARD` — terminal state for passthrough sessions. Once entered, the session never returns to any X-Protocol parsing state. handler() short-circuits past client_ds_.read_from_net()/parse so the bytes are not interpreted as frames. * `MysqlxTlsMode::TLS_PASSTHROUGH` — added back to the per-session TLS posture enum. The previous prototype carried the value without a real implementation; that was removed in the asymmetric-TLS series and is now reintroduced as a real feature. * `handler_passthrough_forward()` — pumps both directions per call up to a 64 KiB burst, then yields so other sessions on the thread are not starved. EAGAIN/EWOULDBLOCK is the normal "no more bytes right now" exit. EOF on either side or any other I/O error transitions to X_SESSION_CLOSING. Listener-route propagation: * New `MysqlxSession::init(fd, thread, listener_route)` overload. The base init(fd, thread) overload calls it with an empty route name, preserving existing test harnesses that construct sessions directly. * `Mysqlx_Thread::accept_new_connection()` looks up the listener fd in the parallel `listener_route_names_` vector and propagates the route name to the new session at accept time. This is the hook that lets per-route policies fire before any X-Protocol message is received — most importantly, before any local handshake decision so a passthrough route can splice from the very first byte. Test-only entry path: * `enter_passthrough_for_test(int backend_fd)` (gated behind MYSQLX_TEST_BUILD) drops a session straight into the splice state with a caller-supplied backend fd. Bypasses CapabilitiesSet / auth / resolve_backend_target so the splice mechanics can be asserted in isolation. set_reusable(false) is set on the stub backend connection to mirror the production-side invariant that a passthrough connection never returns to the pool. Tests (mysqlx_session_unit-t, +22 assertions, plan 65 -> 87): * listener_route_propagation: init() captures, reset() clears * forward_client_to_backend / forward_backend_to_client: bytes survive the splice unchanged in both directions * close_on_client_eof / close_on_backend_eof: peer half-close transitions to X_SESSION_CLOSING and marks the session unhealthy * disables_backend_reuse: backend_conn() exists but is_reusable()=false, and tls_mode_ reports TLS_PASSTHROUGH * handler_dispatch_skips_xprotocol: bytes that would parse as a fake X frame in a non-passthrough state survive the splice unconsumed — proves handler() takes the fast path before the X frame parser sees the buffer Production wiring of the entry path (CapabilitiesSet on a passthrough route -> connect to backend, splice the TLS handshake) lands in a follow-up. This commit is intentionally limited to the splice mechanics plus the listener-route plumbing the entry path will need. |
2 months ago |
|
|
09c42d4fba |
feat(mysqlx): add per-route tls_mode column with passthrough enum value
Adds the schema and config-store plumbing needed to express MySQL Router's
TLS-Passthrough mode as a per-route attribute on `mysqlx_routes`. The actual
data-plane forwarding is implemented in a follow-up commit; this commit only
wires the config so the operator can set / round-trip / project the value.
Schema additions:
* `mysqlx_routes.tls_mode VARCHAR NOT NULL DEFAULT 'inherit'` plus a CHECK
constraint on the canonical lowercase spellings ('inherit', 'disabled',
'preferred', 'required', 'passthrough'). Same column added to
`runtime_mysqlx_routes`.
* Default 'inherit' means "use the deployment-wide `mysqlx_tls_mode`",
preserving existing behaviour for every row that was loaded before this
commit. Operators wanting compliance-pinned passthrough can override one
route at a time without flipping the global mode.
Config store additions:
* `MysqlxRouteTlsMode` enum class (inherit / disabled / preferred / required
/ passthrough) plus matching `mysqlx_route_tls_mode_from_string` (case-
insensitive, empty/NULL -> inherit, unknown -> nullopt) and `_to_string`
helpers — same shape as the existing `mysqlx_backend_tls_mode_*` family.
* `MysqlxRoute::tls_mode` field with a default of `inherit`.
* `MysqlxConfigStore::route_tls_mode(name)` accessor; unknown routes report
`inherit` (matching how `route_hostgroup` returns 0 for unknown routes).
LOAD / SAVE / project paths:
* `install_routes_from_admin` first PRAGMA-probes for the `tls_mode` column
so a pre-upgrade admin DB without it loads cleanly (column treated as
NULL -> inherit). A malformed value (e.g. operator typo) fails the install
with a descriptive `err` rather than silently coercing.
* `save_routes_to_admin_table` and `project_routes_to_runtime_view` write
the column using `mysqlx_route_tls_mode_to_string`.
Tests:
* mysqlx_config_store_unit-t gains nine assertions covering parser
case-insensitivity, the empty-string / unknown-value contract, the
canonical render, the legacy-schema fallback path, and a full
install / parse-failure round-trip against a schema that has the column.
* All previously-passing unit tests remain green.
This commit is intentionally behaviour-preserving: passthrough is parsed
and stored but not yet enforced. Resolving a route with tls_mode=passthrough
still goes through the proxy-terminated path until the follow-up commit
adds the X_PASSTHROUGH_FORWARD session state.
|
2 months ago |
|
|
744fb0bf36 |
feat(mysqlx): preferred-mode backend TLS fallback to plaintext + docs
Closes the loop on issue #5693 (P1: asymmetric TLS / AsClient mode). The previous two commits added the runtime variable and the per- session decision; this commit wires the actual `preferred`-mode fallback path in the backend auth state machine and updates the operator-facing documentation to describe the full four-mode model. What changes: * MysqlxConnection::step_auth_capabilities_set_sent now treats a Mysqlx::Error response from CapabilitiesSet(tls=true) as a fall-back trigger when backend_tls_fallback_allowed_ is set (set by the session for mode=preferred). The connection silently downgrades on the same TCP socket — backend_tls_required_ is cleared so subsequent steps don't re-attempt TLS, tls_active_ stays false (which keeps the connection out of the encrypted half of the per-thread pool), and step_auth proceeds straight into AuthenticateStart on plaintext. Under mode=required (and AsClient + frontend-TLS), the same Error is still fatal — the operator's policy demands encryption. The pre-existing `Frame is not OK` rejection branch is preserved for malformed / unexpected response types. * doc/mysqlx/README.md §8 rewritten: * §8.1 frontend TLS modes (mysqlx_tls_mode, unchanged behaviour). * §8.2 backend TLS modes (mysqlx_tls_backend_mode, full table of the four documented values, migration notes from MySQL Router AsClient, and a connection-pool partitioning note explaining that the cache key now includes tls_active. * §8.3 configuration example showing the asymmetric pattern (frontend REQUIRED + backend preferred). The §3.1 variables table gains the new variable. * doc/mysqlx/MYSQL_ROUTER_PARITY.md updated: * Feature comparison row 4 (TLS modes) now lists 4-frontend x 4-backend with explicit mention of mysqlx_tls_backend_mode and issue #5693. * Asymmetric TLS row marked implemented. * Architecture section §TLS rewritten to describe both the frontend mysqlx_tls_mode and backend mysqlx_tls_backend_mode models; identifies passthrough as the remaining gap. * Feature gaps table marks "Asymmetric TLS / AsClient" and "Per-message response state machines" as implemented. * Summary updated. Tests: test/tap/tests/unit/mysqlx_backend_auth_unit-t (was 34): adds 7 new ok lines covering both branches of the fallback decision: * test_backend_auth_preferred_mode_fallback_to_plaintext: 5 assertions across the wire-level transition (state on entry, rc=1 on Error, AUTHENTICATE_START_SENT after fallback, backend_tls_required_ cleared, tls_active false, AuthStart frame on the wire). * test_backend_auth_required_mode_no_fallback_on_error: 2 assertions confirming the same Error is fatal when fallback_allowed=false. Total 42. All 8 (mode x frontend_tls) acceptance combinations from the issue are now covered: 6 by the decision-function tests in mysqlx_message_dispatch_unit-t (commit 2), and the remaining 2 mode=preferred + backend Error cases by the wire-level fallback tests added here. Tested under NOJEMALLOC=1 WITHASAN=1 PROXYSQLGENAI=1. Closes #5693. Stacks on #5706 / #5704. |
2 months ago |
|
|
167a896c16 |
feat(mysqlx): mode-driven backend TLS decision + tls_active conn-cache key
Implements the per-session decision side of issue #5693 (P1: asymmetric TLS / AsClient mode parity gap with MySQL Router 8.0). The previous commit added the runtime variable; this commit wires it through to the actual backend-connect path and partitions the connection pool by encryption posture so AsClient/required-TLS sessions never reuse plaintext-pooled backends (and vice versa). What changes: * Lifts the per-session decision out of an inline switch in MysqlxSession::handler_connecting_server() into a pure helper `mysqlx_resolve_backend_tls_decision(mode, endpoint_override, frontend_is_encrypted) -> {require_tls, fallback_allowed}`. The helper lives at file scope (not in the anonymous namespace) so the unit test can exercise the 8 (mode x frontend_tls) combinations called out in the issue acceptance criteria directly, without driving the full session state machine. The decision itself replaces the legacy `target_use_ssl_ || client_ds_.is_encrypted()` expression. * Adds two fields on MysqlxConnection: * tls_active_ -- set true by step_auth_tls_handshake() once the OpenSSL handshake completes successfully on the backend leg. Read by the connection cache to partition encrypted-pooled connections from plaintext-pooled ones. * backend_tls_fallback_allowed_ -- carries the `preferred` mode's "downgrade-to-plaintext-on-error" intent through to the auth state machine. Read-only metadata in this commit; the actual fallback path lands in the next commit. * Mysqlx_Thread::get_connection_from_cache now takes a `bool tls_active` parameter and matches on it. Without this, an AsClient TLS session pulling a pooled connection could land on a plaintext backend (or vice versa), corrupting the wire protocol when the next dispatched frame goes out over a socket in the wrong encryption posture. * Endpoint-override semantics (mysqlx_backend_endpoints.use_ssl=1) preserved exactly: it can promote plaintext to TLS regardless of mode, but cannot demote a TLS-required mode to plaintext. Under mode=preferred, the override leaves fallback_allowed=true so the operator's best-effort "preferred" intent isn't silently upgraded to "required". Tests: test/tap/tests/unit/mysqlx_message_dispatch_unit-t (was 86): adds 8 combinations (mode x frontend_tls) + 4 endpoint-override cases = 12 new ok lines, total 98. test/tap/tests/unit/mysqlx_thread_unit-t (was 22): adds test_connection_cache_tls_partition with 3 ok lines exercising the (plaintext, encrypted) hard partition, total 25. Known limitation (TODO addressed in next commit): mode=preferred currently fails the backend connect on Mysqlx::Error from CapabilitiesSet(tls=true) because the fallback-to-plaintext branch isn't wired in step_auth_capabilities_set_sent yet. The metadata (`backend_tls_fallback_allowed_` on the connection) is in place; only the state machine branch is missing. Two of the 8 documented test combinations (mode=preferred + Error from backend) are validated against the metadata only in this commit; the end-to-end fallback behaviour follows. Tested under NOJEMALLOC=1 WITHASAN=1 PROXYSQLGENAI=1. Refs #5693. Stacks on #5706 / #5704. |
2 months ago |
|
|
0246237426 |
feat(mysqlx): add MysqlxBackendTlsMode enum + mysqlx_tls_backend_mode runtime variable
Wires up the configuration plumbing for issue #5693 (P1: asymmetric TLS / AsClient mode parity gap with MySQL Router 8.0). This commit is behaviour-neutral: the new variable is parsed, validated, persisted and exposed via MysqlxConfigStore::get_backend_tls_mode(), but the per- session backend-TLS decision still uses the legacy target_use_ssl_ || client_ds_.is_encrypted() expression. The decision site is rewritten in the next commit. What this adds: * MysqlxBackendTlsMode enum with four values matching MySQL Router's client_ssl_mode / server_ssl_mode taxonomy: disabled, preferred, required, as_client. Default is as_client because that most closely matches the legacy implicit behaviour where the backend leg encryption was tied to the frontend leg's encryption. * mysqlx_backend_tls_mode_from_string() / mysqlx_backend_tls_mode_to_string() for case-insensitive parsing and canonical lower-case rendering. The parser returns std::optional so the install path can surface a useful error to the operator on a typo instead of silently coercing to a default. * MysqlxConfigStore now reads the mysqlx_tls_backend_mode key from mysqlx_variables in install_variables_from_admin(), persists it via save_variables_to_admin_table(), and projects it in project_variables_to_runtime_view(). install fails atomically with a descriptive error when the value is unrecognised; an absent row leaves the cached mode untouched (matches how the other tunables already behave). * MysqlxBackendEndpoint.use_ssl=1 remains an operator-controlled override that forces TLS regardless of the mode (per existing comment at handler_connecting_server). The mode interacts with that flag in the next commit. Tests: test/tap/tests/unit/mysqlx_config_store_unit-t: 16 -> 24 assertions. New coverage: parser accepts all four documented values case-insensitively, parser rejects unknown values, default mode is as_client, LOAD round-trip caches the parsed mode, invalid value fails install with descriptive error, store retains last-good mode after rejected install, absent row leaves cached mode untouched. Tested under NOJEMALLOC=1 WITHASAN=1 PROXYSQLGENAI=1. Stacks on PR #5706 (mysqlx response state machines), which itself stacks on PR #5704 (mysqlx observability P0). Refs #5693. |
2 months ago |
|
|
170ead7ad6 |
fix(mysqlx): reject backend frames disallowed in current response state
Tightens MysqlxSession::is_frame_allowed: a backend frame outside the
per-state allowed set now closes the session with X-Protocol Error 4006
("Backend sent an unexpected message in the current response state")
instead of being forwarded blindly to the client. This guards against
a buggy or hostile backend pushing a frame whose shape the client cannot
parse, which would silently desync the wire and (in the worst case)
amplify a backend protocol bug into a client-side fault.
Adds a new private sub-state field MysqlxSession::seen_column_metadata_
that gates RESULTSET_ROW frames in the four response states where the
X-Protocol requires ColumnMetaData to precede any Row:
- RESP_WAITING_STMT_EXECUTE
- RESP_WAITING_CRUD
- RESP_WAITING_PREPARE_EXECUTE
- RESP_WAITING_CURSOR_OPEN
The flag is set when ColumnMetaData is forwarded in the validation loop,
cleared at every transition into a state that begins a new column-
metadata sequence (in dispatch_client_message), at terminal-frame flush
in handler_waiting_server_msg, and at init() / reset(). It is
deliberately NOT cleared on transition into RESP_WAITING_CURSOR_FETCH —
per the X-Protocol spec, ColumnMetaData is sent at Cursor::Open and not
re-sent at Cursor::Fetch, so CURSOR_FETCH's allowed-set unconditionally
accepts RESULTSET_ROW. The dispatch handler skips the clear at
CURSOR_FETCH entry to make this carry-across explicit.
The rejection action in handler_waiting_server_msg pops the offending
frame from the backend queue (does not forward), emits a fatal error
frame to the client, marks backend_conn_ non-reusable so
return_backend_to_pool deletes it instead of caching a poisoned
connection, sets healthy=false and status_=X_SESSION_CLOSING, and
short-circuits before the bytes_recv accounting (so the disallowed
frame is not double-counted as forwarded traffic).
Tests in mysqlx_message_dispatch_unit-t (20 new assertions across
8 cases) cover:
1. StmtExecute → Row-without-metadata (canonical hostile-backend
case the issue called out): expect Error frame, !healthy,
X_SESSION_CLOSING.
2. StmtExecute → ColumnMetaData → Row → SQL_STMT_EXECUTE_OK: happy
path, terminal flushes seen_column_metadata_.
3. CursorOpen → ColumnMetaData → Row → FETCH_SUSPENDED: terminal,
response_state_ resets, flag cleared at boundary (Cursor::Fetch
does not consult it).
4. CursorOpen → ColumnMetaData → FETCH_DONE: terminal, clean exit.
5. PreparePrepare → SQL_STMT_EXECUTE_OK (allowed-set is OK-only):
expect rejection, X_SESSION_CLOSING.
6. PreparePrepare → OK: happy path.
7. STMT_EXECUTE → ColumnMetaData → NOTICE → Row → SQL_STMT_EXECUTE_OK:
NOTICE is universal-allowed, non-terminal, doesn't consume the
response.
8. CURSOR_FETCH → Row (with seen_column_metadata_=false): forwarded,
NOT rejected (the per-state-pair carve-out for Cursor::Fetch).
Tests use a new setup_session_for_validation helper that drives the
auth flow, attaches a fake backend over a socketpair, parks the
session in WAITING_SERVER_XMSG with the desired response_state_ via
the test-only set_response_state_for_test (gated behind
MYSQLX_TEST_BUILD), and lets the test write synthetic server frames
to the backend half of the pair. Drains pending client-side bytes via
a non-blocking helper so the validation hook's output is unambiguous.
Closes the rejection-side acceptance criterion of #5694. Refs: #5694.
|
2 months ago |
|
|
34968e08d4 |
fix(mysqlx): split CURSOR/PREPARE response states for accurate terminal detection
CURSOR_OPEN's terminal set was conflated with CURSOR_FETCH's, and
PREPARE_PREPARE/DEALLOCATE were lumped with PREPARE_EXECUTE which has a wider
terminal set. Adds RESP_WAITING_CURSOR_{OPEN,FETCH,CLOSE} and
RESP_WAITING_PREPARE_{PREPARE,EXECUTE,DEALLOCATE} so each X-Protocol response
shape gets its own per-state contract.
The two old conflated states accepted the union of all terminal frames
that any sub-shape could legitimately emit, so the proxy would advance to
RESP_IDLE on the first such frame regardless of whether the backend's
response was actually shaped right. With the split:
- PREPARE_PREPARE / PREPARE_DEALLOCATE / CURSOR_CLOSE accept Mysqlx.Ok only
- PREPARE_EXECUTE accepts Ok / SQL_STMT_EXECUTE_OK / FETCH_DONE / FETCH_SUSPENDED
(it inherits the response shape of whichever request was prepared)
- CURSOR_OPEN / CURSOR_FETCH accept FETCH_DONE / FETCH_SUSPENDED
This is purely a tightening of is_terminal_frame; the validation hook
that uses these per-state contracts to actively reject out-of-shape
backend frames is added in the next commit. No behaviour change for
well-behaved backends; existing dispatch tests (66 assertions in
mysqlx_message_dispatch_unit-t, 65 in mysqlx_session_unit-t) continue
to pass unmodified.
Refs: #5694.
|
2 months ago |
|
|
b812045e11 |
refactor(mysqlx): split is_terminal_for_state into is_frame_allowed + is_terminal_frame
No behavior change. Permissive is_frame_allowed (allows everything the existing code implicitly allows by forwarding) sets up the validation hook for the follow-on commits. Removes the now-unused is_terminal_server_frame_generic helper since every state has an explicit case. The new is_terminal_frame variant centralises the universal-NOTICE rule: NOTICE is never terminal in any state, ERROR always is. Previously the caller in handler_waiting_server_msg() short-circuited NOTICE at the call site; folding that into the predicate keeps the validation hook (added in the next commits) from having to know about NOTICE separately. Refs: #5694. |
2 months ago |
|
|
ff9a41871d |
feat(mysqlx): project per-session state into stats_mysqlx_processlist
stats_mysqlx_processlist had its DDL registered (mysqlx_admin_schema.cpp: kStatsMysqlxProcesslistTable) since the plugin-chassis merge but no writer ever existed. Operators querying the table got nothing back, no matter how many concurrent X-Protocol clients were connected. Issue #5691 caught this as the second of the two fully-empty stats surfaces. Wires the projection through the chassis ABI 3 register_runtime_view hook landed in PR #5688 — same pattern as the four runtime_mysqlx_<X> views, mirroring how core's stats___mysql_processlist re-projects on every admin SELECT. Three new pieces: 1. MysqlxSessionSnapshot struct (plugins/mysqlx/include/mysqlx_thread.h) captures one row's worth of session state: username, route name, worker_id, backend host:port, auth_mode, connection_state, and session_age_ms. bytes_in/bytes_out are reserved at 0; the per-route counters in MysqlxStatsStore aggregate by route, not by session, so filling these is P1 work. 2. Mysqlx_Thread::snapshot_sessions_for_stats(out, now_ms) walks sessions_ under sessions_mutex_ and appends one snapshot per active session. Lock scope is bounded (string copy + a few struct field reads); no I/O under the mutex; no cross-thread lock is held. Safe to call from any thread and intended for the chassis runtime-view refresh callback path. 3. mysqlx_populate_stats_processlist(SQLite3DB&) iterates over mysqlx_context().threads, gathers all snapshots into a flat vector under each thread's lock, then DELETEs and re-INSERTs the rows on statsdb. DELETE always runs (empty thread pool / empty session list both mean "no active sessions" — operators must see that, not stale state from the previous refresh). Wires three small read-only state observers on MysqlxSession (username_for_stats, route_name_for_stats, identity_for_stats, start_time_for_stats) so the snapshotter can read what it needs without needing friend-of-thread or exposing the session's mutable fields. These getters return values a debugger could already observe and cannot mutate the session. The refresh callback (refresh_stats_processlist_view in mysqlx_admin_schema.cpp) follows the same get_statsdb-via-services pattern as refresh_stats_routes_view, with one extra null-pointer guard: mysqlx_populate_stats_processlist is __attribute__((weak)) so the admin-schema unit test (which compiles mysqlx_admin_schema.cpp but doesn't link mysqlx_plugin.cpp) still links — the runtime null check is the safety net for that test build. Tests: relies on the existing fixture coverage in mysqlx_thread_unit-t and mysqlx_concurrent_unit-t to exercise the session-walk path without regression. A standalone snapshotter test would need to construct fake Mysqlx_Thread + MysqlxSession instances, which was scope-creep for P0 — defer to integration TAP coverage as the issue body recommends. All 9 affected unit suites stay green (255 assertions, no leaks introduced under ASAN). Known limitation, same as the runtime-view callback in the previous commit: SELECTs against the stats port (port 6032 with stats credentials) bypass the chassis dispatcher and return whatever's in the table since last refresh. Filing as a separate chassis-side follow-up. Refs: #5691. |
2 months ago |
|
|
796f336cb0 |
feat(mysqlx): expose stats_mysqlx_routes via runtime-view refresh
stats_mysqlx_routes was previously declared (DDL registered in mysqlx_admin_schema.cpp:466) but had no writer — the MysqlxStatsStore::flush_to_sqlite() projection method was implemented months ago and has never been called. Issue #5691 caught that "no caller" gap; admin SELECTs against the table return whatever's left from previous test fixture data, which is empty in normal operation. Wires the projection through the chassis ABI 3 register_runtime_view hook landed in PR #5688. Identical shape to the four runtime_mysqlx_<X> projections already in place for users / routes / endpoints / variables: chassis fires the refresh callback before any admin SELECT references the registered table name, callback rebuilds the projected rows from the canonical in-memory state. The wrinkle vs the existing four: stats data lives in statsdb, not admindb. The chassis-supplied admindb argument is ignored; refresh_stats_routes_view fetches the statsdb handle through the plugin's cached services pointer (mysqlx_context().services-> get_statsdb()) and hands that to flush_to_sqlite. flush_to_sqlite writes a bare table name, so reaching stats_mysqlx_routes via the admindb-attached `stats.` schema would work but adds an unnecessary detour and forces a write through the wrong handle. Mirrors how core's stats___mysql_processlist() writes statsdb directly (lib/ProxySQL_Admin_Stats.cpp:885). Known limitation, flagged in the issue: the chassis only fires plugin runtime views on admin-session SELECTs (gated on `if (admin)` in lib/ProxySQL_Admin.cpp). SELECTs against the stats port (port 6032 with stats credentials) bypass the dispatcher entirely → return the table contents at last refresh. Filing as a separate chassis- side follow-up. Plumbing additions: - mysqlx_admin_schema.cpp pulls in mysqlx_stats.h and defines refresh_stats_routes_view (~10 lines). - The single-line register_runtime_view call goes inside the existing tail-extension guard (`if (services.register_runtime_view != nullptr)`) — same pattern as the other four. - test/tap/tests/unit/Makefile: three test build rules (mysqlx_admin_schema_unit-t, mysqlx_admin_commands_unit-t, mysqlx_admin_disk_commands_unit-t) now also need to compile mysqlx_stats.cpp into the test binary, since mysqlx_admin_schema.cpp now depends on it. Single-line addition per rule. Refs: #5691. |
2 months ago |
|
|
04f771d2a3 |
feat(mysqlx): account per-route bytes_sent / bytes_recv on the data plane
The MysqlxRouteStats struct already had bytes_sent / bytes_recv atomic fields, but no setter and no caller — issue #5691 caught the third and fourth dead counters on the same dead-code list as conn_ok / conn_used. Adds two setters to MysqlxStatsStore: - record_bytes_sent(route, hg, n) - record_bytes_recv(route, hg, n) Both fetch_add(n, relaxed) under the existing mutex, with a 0-arg fast path that skips the lock entirely (frame.size() == 5 means a header- only frame and is the natural early-out — no underflow guard needed on `size - 5` because the call sites only fire when size > 5). Wires them at the two natural data-plane sites: - MysqlxSession::forward_to_backend — bytes_sent is "X-Protocol payload bytes the proxy forwarded from client to backend", measured as `frame.size() - 5` (strip the 5-byte X-Protocol frame header so the counter tracks operator-meaningful query/CRUD bytes rather than wire-level total). - MysqlxSession::handler_waiting_server_msg — bytes_recv is the same payload-only measure for the backend → proxy → client leg. NOTICE frames are counted (they're part of the data plane the operator paid for forwarding); the OK / EXECUTE_OK / FETCH_DONE family contributes 0 because their payloads are typically empty. Both counters need the route name available at the I/O site without re-reading identity_->default_route per frame. Caches that string into MysqlxSession::route_name_ at the resolve_backend_target() success tail and clears it in init() and reset(). The dataplane sites read route_name_ directly. (identity_ would not be null at those sites in practice — resolve_backend_target() is gated on a populated identity — but route_name_ avoids the optional-deref entirely and side-steps any future code path that nulls identity_ in-flight without a corresponding state transition.) Tests: extends mysqlx_stats_unit-t.cpp to plan(26), adding 4 assertions covering the new bytes_sent / bytes_recv accumulation through flush_to_sqlite, including the 0-arg no-op invariant and that destination_hostgroup is carried through. Refs: #5691. |
2 months ago |
|
|
b1f973b163 |
feat(mysqlx): record conn_ok and conn_used in handler_connecting_server
The mysqlx plugin's MysqlxStatsStore declares five per-route counters (conn_ok, conn_err, conn_used, bytes_sent, bytes_recv) but issue #5691 caught that, of those five, only conn_err is incremented from production code (from the failure modes of resolve_backend_target). The other four are dead. Wires the two connection-success counters at their natural sites in MysqlxSession::handler_connecting_server: - record_conn_used at the cache-hit early-return branch (took an existing pre-warmed backend connection out of the per-thread pool in Mysqlx_Thread::get_connection_from_cache; no fresh TCP, no fresh TLS, no fresh backend auth performed). - record_conn_ok at the fresh-connection success tail (TCP connect, optional TLS handshake, and step_auth() all returned non-error, no early return fired). This is the "established a brand new backend connection from scratch" counter — strictly disjoint from conn_used. Both call sites already have target_hostgroup_ in scope (set by resolve_backend_target before this state is reachable) and identity_ (set during the frontend auth flow). The route-name argument falls back to the empty string when identity_ is null, defensively — in practice it cannot be null past resolve_backend_target's success path, but the ternary avoids a crash if the state machine ever ends up here without one and reads identity_->default_route via the dot operator on a moved-from optional. The bytes_sent/bytes_recv counters and the runtime-view projection that surfaces these in stats_mysqlx_routes are wired in follow-on commits per the P0 plan on #5691. Refs: #5691. |
2 months ago |
|
|
d564d3cdb5
|
Merge pull request #5726 from sysown/feature/mysqlx-asan-coverage-docker-isolation
ci(asan-coverage): containerise unit-tests workflow + extract runner script |
2 months ago |
|
|
1d2eea260c |
ci(asan-coverage): containerise unit-tests workflow + extract runner script
Ports CI-unit-tests-asan-coverage from host-direct execution to Docker isolation, mirroring the architecture established for TSAN in PR #5725. Closes #5721 for the ASAN-coverage half. Why: Two parallel CI runs on a shared / self-hosted runner can no longer collide on the host filesystem (no /opt/proxysql contention, no toolchain skew between build env and run env). The runner stays clean — no host-direct `apt install lcov fastcov`, no host-direct `make build_deps_debug` polluting it. Architecture: * Build phase: `make ubuntu24-tap` with WITHASAN=1 WITHGCOV=1 NOJEMALLOC=1 PROXYSQLGENAI=1, runs entirely inside the ubuntu24_dbg_build container (same path TSAN uses). * Test+coverage phase: `docker compose run --rm` re-enters the same image and invokes the new canonical runner script test/infra/control/run-unit-tests-asan-coverage.bash. The workflow YAML is now a thin wrapper around the script — local repro and CI execute the exact same command. The extracted script: * Iterates every executable under test/tap/tests/unit/ (drop-in replacement for the old host-direct loop). Deliberately not routed through run-tests-isolated.bash because that runner's dual-directory test discovery (test/tap/tests/ in addition to .../unit/) pulls in misclassified entries from groups.json that aren't actually unit tests (e.g. unit-strip_schema_from_ query-t lives in test/tap/tests/, needs backend infra, fails silently as a host-direct binary). Cleaning that up is out of scope here. * Captures baseline (--initial) + post-test LCOV, merges, filters /usr + deps + test, runs genhtml. * Idempotent on lcov / libprotobuf-dev — only apt-installs when missing so re-running locally inside the same container is fast. * Honours ASAN_OPTIONS from the caller; defaults match the env block at the top of the workflow. PROXYSQLGENAI=1 stays (instead of dropping to PROXYSQL40=1) — the unit-test set includes genai_*_unit-t binaries that only build under the genai tier. Coverage scope is unchanged from the pre-Docker workflow. Verified locally — same `make ubuntu24-tap` + `docker compose run --rm ... run-unit-tests-asan-coverage.bash` invocation the workflow uses: 83/83 unit tests pass under ASAN, coverage report generated (13.1% lines / 21.3% functions, expected for the unit-only scope), lcov.info + coverage/html/ + unit-test-logs/ all land in the host workspace via the bind mount. Workflow YAML net diff: -185 lines (the test+coverage logic moved out of the YAML into the script). |
2 months ago |
|
|
683fc7d841
|
Merge pull request #5727 from sysown/fix/ci-unit-tests-tsan-project-name
ci(tsan): drop bogus -p PROJECT from docker compose run |
2 months ago |
|
|
540fb5b4e6 |
ci(tsan): drop bogus -p PROJECT from docker compose run
Fixes a regression introduced in
|
2 months ago |
|
|
29402b4a42 |
docs(plugins/genai): close 3 small gaps from review
# 1. Real prepared statement in local_proxy_endpoint.cpp
read_global_variable's comment claimed "Parameterised lookup via
prepared statement" but the implementation did string concatenation:
"SELECT variable_value FROM main.global_variables WHERE
variable_name='" + std::string(var_name) + "'"
Today's only callers pass hardcoded "mysql-interfaces" /
"pgsql-interfaces", so the SQL injection surface is zero — but the
comment is a footgun for the next caller and we have a working
prepare_v2 / bind_text pattern right next door in plugin_main.cpp.
Replace with the proper prepared-statement form using
proxy_sqlite3_step + proxy_sqlite3_column_text; semantics
(empty-string on miss / error) are unchanged.
# 2. Concurrency contract on genai_refresh_runtime_components
The function (introduced in
|
2 months ago |
|
|
b501fa17dc |
genai: harden real persistence and connection bugs
Fix the remaining concrete defects from the GenAI review pass: - serialize MCP variable access with the handler rwlock instead of relying on external callers - make GenAI/MCP save-to-admin operations transactional and fail closed on SQLite errors - clamp genai_log() newline handling after truncation - use PQconnectdbParams() for libpq connections so credentials and schema values are passed safely - install and uninstall the GenAI plugin alongside mysqlx in the top-level Makefile - add a regression test for stale output handling in get_variable_string() These changes keep the runtime and persistence paths consistent with the branch's plugin lifecycle fixes. |
2 months ago |
|
|
967ab401ec |
genai: fix lifecycle reloads and drop dead MCP stats registration
Load GenAI and MCP variables before runtime initialization, reinitialize the AI stack on reload, and make the anomaly hook obey the configured enable flags. Restore the missing MCP command aliases and the disk/config reload verbs, fix the MySQLX packaging filename mismatch, and update the unit harness for the plugin ABI. Also remove the stale stats_mcp_* registrations from the plugin surface. There is no plugin-side writer for those tables in this branch, so advertising them as live schema was misleading. Update the unit test and bootstrap comments to match the actual exposed surface. |
2 months ago |
|
|
b6b6a4f62b |
fix(genai): properly gate sqlite-vec hook on PROXYSQLGENAI
Reverts |
2 months ago |
|
|
bf908058a5 |
Revert "build(deps): always build sqlite-vec, not gated on PROXYSQLGENAI"
This reverts commit
|
2 months ago |
|
|
93d35237bc |
build(deps): always build sqlite-vec, not gated on PROXYSQLGENAI
Step 7 of the GenAI plugin carve-out made the sqlite-vec call site
in core unconditional (lib/proxy_sqlite3_symbols.cpp:58 includes
"sqlite-vec.h"; src/Makefile linkages $(SQLITE_VEC_OBJ) into
libproxysql.a unconditionally). But deps/Makefile still gated the
ACTUAL build of vec.o + sqlite-vec.h on PROXYSQLGENAI=1, so
non-genai builds (debian12-dbg, ubuntu22-tap on the CI matrix)
failed at the lib step:
proxy_sqlite3_symbols.cpp:58:10: fatal error: sqlite-vec.h:
No such file or directory
Always pull sqlite-vec into the deps build (the existing
`sqlite-vec: sqlite3/sqlite3/vec.o` target stays for callers that
explicitly request it). Per the design intent documented next to
$(SQLITE_VEC_OBJ) in src/Makefile: vec.o is always linked into
proxysql so the genai plugin (when dlopen'd) can call
sqlite3_vec_init on the same SQLite that core links against;
without the plugin loaded, the extension is dead code that doesn't
hurt non-genai installs.
|
2 months ago |
|
|
dffa89de7a |
fix(ci): repair non-PROXYSQL40 dbg builds + genai unit-test linking
CI surfaced two separate build breakages that had been latent since
the carve-out steps but only became visible once they ran on the
right matrix variants.
# lib/MySQL_Session.cpp + lib/PgSQL_Session.cpp: chassis dispatch
# block needs PROXYSQL40 guard
The query-hook dispatch I added in Step 2.2 references chassis types
(`ProxySQL_PluginProtocol`, `ProxySQL_PluginQueryHookPayload`,
`ProxySQL_PluginQueryHookResult`, etc.) without an `#ifdef PROXYSQL40`
guard. Those types are only declared when ProxySQL_Plugin.h is
compiled with `-DPROXYSQL40` — v3.0/v3.1 dbg builds (debian12,-dbg
and ubuntu22,-tap on the CI matrix) define neither, so the lib step
fails:
MySQL_Session.cpp:4477:127: error: 'ProxySQL_PluginProtocol' has
not been declared
MySQL_Session.cpp:4477:85: error: 'proxysql_has_configured_plugin
_query_hook' was not declared
in this scope
[+ 7 more identical errors in PgSQL_Session.cpp]
Wrap both dispatch blocks (MySQL_Session.cpp:~4477-4509,
PgSQL_Session.cpp:~2414-2446) in `#ifdef PROXYSQL40`. The block was
only meaningful when the chassis is present anyway — the call to
`proxysql_has_configured_plugin_query_hook` short-circuits to false
when no plugin is loaded, but the SYMBOL doesn't exist at all in
non-chassis builds.
# test/tap/tests/unit/Makefile: PROXYSQLGENAI autodetect probe was
# defining the macro without a way to satisfy the resulting linker
# requirements
Pre-Step-7 the autodetect probed for `MCP_Tool_Handler` in
libproxysql.a; this symbol is plugin-side now, so the probe never
matches and PROXYSQLGENAI stays empty. My previous attempt to
"fix" the autodetect (probing `invoke_register_schemas_phase`) made
it match again — but that defines PROXYSQLGENAI for the WHOLE unit-
test build, including tests like `genai_llm_clients_unit-t` and
`genai_mcp_endpoint_unit-t` that pull in plugin headers AND
instantiate plugin classes. Those classes' definitions live in
plugin .cpp files that the unit-test build does NOT link, so the
result was:
genai_llm_clients_unit-t.cpp:201: undefined reference to
`LLM_WriteCallback(void*, unsigned long, ...)' [+5 more]
Solution: never auto-define PROXYSQLGENAI for the unit-test build.
Tests that legitimately exercise plugin internals
(`genai_plugin_anomaly_unit-t`, `genai_plugin_backend_client_unit-t`,
`genai_plugin_load_unit-t`, `genai_fts_string_unit-t`) declare a
new GENAI_PLUGIN_DEFINES variable on their dedicated rule and add
the specific plugin .cpp files they need to the link line. Every
other genai_*_unit-t test guards its body in `#ifdef PROXYSQLGENAI
... #else SKIP #endif`, so falling through to the SKIP path keeps
CI green. Coverage for those tests in non-genai builds was already
zero — the autodetect was never activating PROXYSQLGENAI for them in
practice (the probed symbol moved out in Step 6). This commit
documents that reality instead of pretending to maintain coverage
that didn't exist.
# test/tap/tests/unit/genai_fts_string_unit-t.cpp: stub for
# MySQL_Tool_Handler::execute_query
The new dedicated rule for genai_fts_string_unit-t compiles
plugins/genai/src/MySQL_FTS.cpp directly into the test binary.
MySQL_FTS::index_table calls MySQL_Tool_Handler::execute_query — but
this test only exercises the pure string helpers (sanitize_name /
escape_*) and never reaches index_table, so the call site is
unreachable at runtime. The linker still needs a body, so we
provide an empty stub directly in the test .cpp. The real
implementation lives in MySQL_Tool_Handler.cpp which we can't link
without dragging in the full plugin runtime stack.
|
2 months ago |
|
|
978a6f8d2f |
fix(plugins/genai): blocker fixes from PR-#5701 review
Five concrete fixes uncovered by the four-agent review (architecture,
code-safety, build/packaging, test coverage):
# Blocker 1: per-row INSERT failure leaves transaction half-done
In the six MCP_Threads_Handler methods that follow the
BEGIN -> DELETE -> prepare -> loop INSERT -> COMMIT pattern, the
SAFE_SQLITE3_STEP2 macro inside the loop didn't check `rc`. If a
single INSERT failed (constraint violation, disk full, ...), the
loop would continue binding subsequent rows and the COMMIT below
would either succeed with partial data or be left dangling. Hoist
the per-row binding into three insert_*_row(stmt, row) -> bool
helpers in an anonymous namespace, then have every caller check the
return value and `ROLLBACK; return false/return;` on failure.
Affects save_auth_profiles_to_admin_table, save_target_profiles_to
_admin_table, save_query_rules_to_admin_table, project_auth_profiles
_to_runtime_view, project_target_profiles_to_runtime_view,
project_query_rules_to_runtime_view, plus the new save_profiles_to
_admin_table below.
# Blocker 2: cross-table install/save atomicity for profiles
target.auth_profile_id is an FK to auth.auth_profile_id. The old
mcp_load_target_auth_map_from_admindb / mcp_save_target_auth_map_to_
admindb wrappers ran the two installs / two saves as separate
operations under separate locks / transactions. A failure of the
second step (or a concurrent LOAD/SAVE racing in between) left
target_auth_map rebuilt from a (auth_v2, target_v1) mismatch, or
left main.mcp_target_profiles referencing auth_profile_ids that
didn't exist in main.mcp_auth_profiles.
Add atomic combined methods:
- install_profiles_from_admin: reads both source tables BEFORE
taking the wrlock (so a slow admindb doesn't gate the listener),
then under one wrlock swaps both vectors and rebuilds the joined
target_auth_map exactly once.
- save_profiles_to_admin_table: snapshots both vectors under one
rdlock, then deletes target before auth (FK direction-aware) and
inserts auth before target inside a single BEGIN ... COMMIT.
The plugin_main.cpp wrappers now route through these atomic methods.
The per-table install_*_from_admin / save_*_to_admin_table public
methods stay (used by future granular admin verbs and unit tests),
but each rebuilds target_auth_map after its own swap as before.
# Blocker 3: unit-test PROXYSQLGENAI autodetect probe
test/tap/tests/unit/Makefile had been probing libproxysql.a for the
`MCP_Tool_Handler` symbol to autodetect PROXYSQLGENAI. Step 7 of
the carve-out moved that symbol to plugins/genai/, so the probe
silently found 0 matches and stopped defining -DPROXYSQLGENAI for
unit-test builds. Switch the probe to invoke_register_schemas_phase
(the chassis-exclusive symbol that's already used to probe
PROXYSQL40) so the macro auto-defines whenever the chassis is
available — which matches when genai-plugin unit tests can actually
be built and exercised.
# Blocker 4: triplet coverage through dispatch surface
Extend genai_plugin_load_unit-t to drive the full install/save/project
flow through the production dispatch path:
- seed mcp_<X> tables in admindb
- dispatch "LOAD MCP PROFILES TO RUNTIME" via mgr.dispatch_admin_
command (same path admin SQL takes)
- manually invoke refresh_runtime_views_for_query (the chassis hook
that fires on every admin SELECT) and assert runtime_mcp_<X>
rows match the source
- mutate main.<X> directly to simulate an operator stomp, then
dispatch "SAVE MCP PROFILES TO MEMORY" and assert the in-memory
snapshot was written back over the stomp
This is the end-to-end coverage that plugin_runtime_views_unit-t
can't provide (it uses synthetic callbacks) and that a standalone
genai_mcp_config_store unit test would have provided at the cost of
stubbing 9 plugin classes. Plan bumped from 25 -> 36.
# Should-fix: atomic fence + GloGATH lifetime
genai_anomaly_embed_fn was std::atomic with relaxed ordering; the
comment claimed nothing else needed synchronising. Wrong: the
embed function dereferences GloGATH, a non-atomic global mutated by
genai_init / genai_stop. Pair the load with acquire and the stores
with release so a reader that observes the non-null pointer also
observes the prior `GloGATH = new ...`, and a reader that observes
the post-stop nullptr short-circuits before GloGATH's deletion is
visible. Acquire/release is free on x86_64 / arm64 — no perf
regression.
# Should-fix: harden DEB awk substitution + RPM glob
DEB entrypoint: replace the inline awk -v repl="$..." substitution
(which mangled paths containing awk metacharacters via gsub) with a
file-backed awk getline that reads the replacement block verbatim.
Add a fail-fast grep for the placeholder after substitution so a
silently-broken substitution can't ship a malformed package.
RPM (rhel + suse): the spec gates `/usr/lib/proxysql/*.so` on
%if 0%{?with_plugins}, but rpmbuild aborts on "File not found by
glob" if the directory is empty (silent plugin build failure +
with_plugins=1). Have the entrypoint compgen-check whether any .so
actually got staged and only pass --define "with_plugins 1" when
true.
|
2 months ago |
|
|
b840468cd5 |
test(unit): align genai_plugin_load + register plugin_runtime_views
Two unit-test-side fixes uncovered by running unit-tests-g1 against the new ABI-3 / Phase-B plugin shape: # genai_plugin_load_unit-t * setup_admindb_schema was using a pre-Step-4.G shape for the mcp_auth_profiles / mcp_target_profiles tables — the new install_*_from_admin reads the full canonical column set (use_ssl, ssl_mode, comment for auth; description, comment for targets) and was failing with `no such column: use_ssl`. Fixture now mirrors the DDL in include/ProxySQL_Admin_Tables_Definitions.h and also creates mcp_query_rules + runtime_mcp_query_rules so the newly-added install_query_rules_from_admin path also has tables to read. * As of Step 4.G the genai plugin publishes its admin/config/stats table set via genai_register_schemas (Phase B), not init. The test was calling load → init_all → start_all and the table-count assertions saw zero rows because Phase B never fired. Add an explicit invoke_register_schemas_phase between load and init_all (matches the order ProxySQL itself uses at startup) and bump the plan from 25 to 26 to cover the new ok(). # Makefile UNIT_TESTS list plugin_runtime_views_unit-t.cpp lives in test/tap/tests/unit/ and exercises the chassis ABI-3 register_runtime_view dispatch surface that landed in PR #5688. It had a build rule but wasn't in UNIT_TESTS, so the runner reported "(not-found)" for it. Wire it in alongside the other plugin-chassis unit tests under PROXYSQL40. |
2 months ago |
|
|
34838ebea4 |
build(packaging): ship plugin .so files in DEB / RPM / SUSE artefacts
The chassis turns proxysql into a loader; runtime features
(mysqlx, genai/MCP) ship as separate .so files. Until now the
pre-existing packaging only saw the proxysql binary, so a v4.0
package install lost the plugins entirely — the operator had to
manually drop the .so files in place.
Wire them through all three packaging flavours:
* docker/images/proxysql/deb-compliant
- entrypoint.bash: copies the built .so files into pkgroot/plugins/
when the appropriate build flag is set (PROXYSQL40 for mysqlx,
PROXYSQLGENAI for genai), then patches a placeholder in the
equivs control file with the matching `Files:` entries that
install them under /usr/lib/proxysql/.
- proxysql.ctl: adds the placeholder line.
* docker/images/proxysql/{rhel,suse}-compliant
- entrypoint.bash: copies the .so files into proxysql-${VER}/usr/lib/
proxysql/ before the source tarball is rolled, and passes
`--define "with_plugins 1"` to rpmbuild when the flags are set.
- proxysql.spec: gates the new `%dir /usr/lib/proxysql` +
`/usr/lib/proxysql/*.so` block under `%if 0%{?with_plugins}` so
v3.x release builds (where the directory is empty) don't fail
the build with `RPM build errors: File not found by glob`.
* etc/proxysql.cnf: add a commented-out `plugins=(...)` example
with absolute paths matching the install location. Operators have
to opt in explicitly — auto-loading would silently change behaviour
on a v3.x → v4.0 upgrade without giving them a chance to review.
Conditional on PROXYSQL40 / PROXYSQLGENAI throughout so the v3.x
release-package paths stay byte-identical to before this commit.
|
2 months ago |
|
|
482ce386cd |
chore(genai-carveout): strip dead PROXYSQLGENAI blocks + plugin hardening
Two threads of cleanup that had to land together because they touch
both core (where the dead code lives) and the plugin (where the new
module-owned state lives):
# Strip dead #ifdef PROXYSQLGENAI from lib/, include/, src/ (Spec Q9)
Step 7 of the carve-out left PSQLGA empty in lib/Makefile, so every
#ifdef PROXYSQLGENAI block in the core build became permanently false.
The blocks remained as dead text (visible to readers, irrelevant to
the binary). Strip ~600 lines spanning:
src/main.cpp 2 sites
lib/Admin_Bootstrap.cpp 3 sites (mcpdb open + attach +
flush_*_variables hooks)
lib/Admin_FlushVariables.cpp 2 sites (~250 lines of stub +
#if 0 _ORIGINAL bodies)
lib/Admin_Handler.cpp 5 sites (LOAD/SAVE GENAI VARIABLES
dispatch + LOAD/SAVE MCP
VARIABLES dispatch +
MCP profiles handler)
lib/ProxySQL_Admin.cpp ~10 sites (init_*_variables +
load_mcp_server +
load/save_mcp_query_rules
+ GenericRefreshStatistics
MCP probes)
lib/ProxySQL_Admin_Stats.cpp 3 stats___mcp_* function bodies
include/proxysql_admin.h 7 method declarations
include/ProxySQL_Admin_Tables_Definitions.h 4 unused DDL macros
The plugin now owns LOAD/SAVE MCP VARIABLES, LOAD/SAVE GENAI VARIABLES,
LOAD/SAVE MCP PROFILES, LOAD/SAVE MCP QUERY RULES via its admin command
registry; the chassis dispatcher catches them before any of the dead
core branches would have fired.
Caveat — known break: the `stats_mcp_*` tables are still registered
(empty schema) but the populator path that fed them is gone. SELECTs
return empty result sets until a follow-up wires the populator into
the plugin (likely via register_runtime_view or a parallel stats-side
ABI). Tracked separately.
# Plugin hardening (review-feedback items 4-7)
* plugins/genai/Makefile: add -fvisibility=hidden,
-fvisibility-inlines-hidden, -fstack-protector-strong (mirrors
plugins/mysqlx). Tag proxysql_plugin_descriptor_v1 with
__attribute__((visibility("default"))) so the loader's dlsym still
resolves; without the explicit annotation the hidden-default flag
would also hide the entry point.
* plugins/genai/src/Anomaly_Detector.cpp: convert
genai_anomaly_embed_fn to std::atomic<…> with relaxed loads/stores.
The detector hot-path read races with init/stop on the lifecycle
thread; atomics give us a portable no-torn-pointer guarantee
without paying for acquire/release fences we don't need (no other
state synchronises with the pointer). Replaces the hand-wavy
"no mutex needed" comment with the actual reasoning.
* plugins/genai/src/{plugin_main,plugin_commands,plugin_tables}.cpp:
route the 17 fprintf(stderr, "genai plugin: ...") log lines
through a new genai_log() helper that calls
services->log_message when the chassis is wired up and falls back
to stderr for early-init / unit-test paths. Lines now land in
proxysql.log alongside the rest of the runtime.
* plugins/genai/include/MCP_Thread.h: add get_variable_string(name,
std::string&) returning a std::string, and switch
mcp_save_variables_to_admindb (plugin_main.cpp) to it. The legacy
get_variable(name, char*) had an unbounded sprintf into a stack
buffer and the SAVE path was passing char val[256] — a real
overflow risk for *_endpoint_auth bearer tokens.
* plugins/genai/src/plugin_main.cpp: rewrite the genai_init / genai_stop
comment block with the actual teardown ordering rationale (consumers
before producers; atomic-clear-then-delete for the embed hook;
why Prometheus counters stay registered).
|
2 months ago |
|
|
16253a1c99 |
feat(plugins/genai): adopt ABI-3 separation-of-duties for runtime_mcp_*
Wire the genai plugin into the plugin-chassis ABI-3 contract added in PR #5688: Admin owns the editable mcp_<X> tables, the module owns the in-memory snapshot under its own mutex, and runtime_mcp_<X> is a chassis-projected view repopulated lazily by a refresh callback before each admin SELECT. No more triple-storage of profile / query-rule data. # MCP_Threads_Handler: per-table install / save / project triplets Replaces the monolithic load_target_auth_map(joined-resultset) with three independent triplets, mirroring the mysqlx config_store rework: install_<X>_from_admin reads main.mcp_<X>, replaces the in-memory snapshot vector under wrlock, rebuilds the joined target_auth_map (for profiles) save_<X>_to_admin_table REPLACEs main.mcp_<X> from the snapshot project_<X>_to_runtime_view DELETE+INSERT runtime_mcp_<X> from the snapshot — invoked only by the chassis runtime-view refresh dispatcher Two new vectors (auth_profiles_, target_profiles_, query_rules_) hold the authoritative per-table rows; target_auth_map remains as the joined view consumed by the listener and is rebuilt whenever either profile vector changes. # Plugin descriptor + table registration genai_register_admin_tables now also calls services->register_runtime_view for runtime_mcp_auth_profiles, runtime_mcp_target_profiles, and runtime_mcp_query_rules, pointing each at a project_*_to_runtime_view trampoline. The runtime_mcp_<X> tables stay registered for their CREATE TABLE schema only — their rows are entirely owned by the per-SELECT projection callbacks from this point on. # Admin SQL surface LOAD MCP PROFILES TO RUNTIME / LOAD MCP QUERY RULES TO RUNTIME now go through install_<X>_from_admin and never touch runtime_mcp_<X>. SAVE MCP PROFILES TO MEMORY is added (was missing pre-ABI-3) and joins SAVE MCP QUERY RULES TO MEMORY in pulling from the module snapshot instead of the runtime view. Query_Tool_Handler::refresh_target_registry no longer re-reads runtime_mcp_<X> via SQLite on every refresh; it consumes the in-memory snapshot directly through GloMCPH->get_all_target_auth_contexts(). # Drop stale GENAI:-prefix tests test/tap/tests/genai_{async,embedding_rerank,live_validation}-t.cpp were left over from before Step 4.A removed the GENAI: query-prefix escape hatch — they would all have failed under ai-g1. Delete them and their groups.json / ai/README.md references; equivalent coverage now flows through the MCP /mcp/ai endpoint and the genai_module-t suite that already drives the plugin surface. |
2 months ago |
|
|
7f148940e3 |
feat(plugins/genai): Step 8b — wire LOAD/SAVE GENAI VARIABLES via plugin
Mirror of the 4.F MCP variable wiring, applied to genai-* variables.
Closes the gap that surfaced in the ai-g1 spot-check where
genai_module-t saw "default value" / "CHECKSUM GENAI VARIABLES" empty
because flush_genai_variables___* was stubbed in Step 5 and there
was no plugin-side replacement.
New helpers (plugins/genai/src/plugin_main.cpp + genai_plugin.h):
genai_load_variables_from_admindb(ctx)
SELECT variable_name, variable_value FROM main.global_variables
WHERE variable_name LIKE 'genai-%' →
GloGATH->set_variable(name + 6, value) for each row.
Mirrors the pre-Step-5 flush_genai_variables___database_to_runtime.
genai_save_variables_to_admindb(ctx)
Walks GloGATH->get_variables_list() and REPLACEs the
`genai-<name>` rows in main.global_variables. Mirrors the
pre-Step-5 flush_genai_variables___runtime_to_database.
Both helpers wrlock GloGATH for the duration of their walk, so
callers don't have to coordinate.
New plugin-registered admin SQL verbs (plugin_commands.cpp):
LOAD GENAI VARIABLES TO RUNTIME
aliases: FROM MEMORY, FROM MEM, TO RUN
SAVE GENAI VARIABLES TO MEMORY
aliases: TO MEM, FROM RUNTIME, FROM RUN
End-to-end verified against the running ai-g1 infra:
SET genai-llm_provider='openai';
LOAD GENAI VARIABLES TO RUNTIME;
SAVE GENAI VARIABLES TO MEMORY;
SELECT * FROM main.global_variables WHERE variable_name LIKE 'genai-%';
-> 32 rows (the full GenAI_Threads_Handler variable set, populated
by the SAVE FROM RUNTIME walk, including the value just SET).
This is a follow-up gap the unit tests don't catch (the pattern
mirrors LOAD/SAVE MCP VARIABLES which 4.F already validated end-to-end);
ai-g1 caught it because genai_module-t hits CHECKSUM GENAI VARIABLES
which evaluates over the populated row set.
The pre-Step-5 ProxySQL_Admin::flush_genai_variables___* functions
remain stubbed in core (no callers reach them now — the chassis
dispatcher routes LOAD/SAVE GENAI VARIABLES verbs to the plugin
before admin_handler_command_load_or_save can fire). Step 7's dead-
code cleanup pass can drop them entirely.
|
2 months ago |