proxysql

Commit Graph

Author	SHA1	Message	Date
Rene Cannao	2f8e63cef2	Address code review feedback for AI TAP group migration Fixes from PR #5461 review: 1. Fix BASE_GROUP derivation inconsistency in run-tests-isolated.bash - Changed from bash pattern matching `${TAP_GROUP%%-g[0-9]}` to sed - Now uses same pattern as ensure-infras.bash: `sed -E "s/[-_]g[0-9]+.//"` - Removed redundant BASE_GROUP reassignment 2. Update outdated comments in seed files - seed-mysql.sql and seed-pgsql.sql now correctly reference setup-infras.bash 3. Change INSERT OR IGNORE to INSERT OR REPLACE in mcp-config.sql - Ensures credentials are updated on reruns for deterministic state 4. Add shellcheck directives to env.sh files - Added `# shellcheck shell=bash` to ai/env.sh and ai-g1/env.sh 5. Add explicit validation for derived infrastructure names - setup-infras.bash now validates DEFAULT_MYSQL_INFRA and DEFAULT_PGSQL_INFRA - Provides clear error messages if infras.lst is misconfigured 6. Add WORKSPACE export to README examples - All runnable examples now include `export WORKSPACE=$(pwd)` Test verification: - ai-g1 group infrastructure setup works correctly - legacy-g2 group tests still pass (backward compatibility verified)	2 months ago
Rene Cannao	0b9806c46e	Migrate AI TAP group to Unified CI Infrastructure pattern This commit migrates the ai TAP group from its legacy hook-based approach to the standard test/infra/ Unified CI Infrastructure pattern. Changes: - Added generic hook system to infrastructure scripts: * ensure-infras.bash: Executes group-specific setup-infras.bash hook * run-tests-isolated.bash: Executes group-specific pre-cleanup.bash hook - Migrated ai group infrastructure: * Created infras.lst with infra-mysql84 and docker-pgsql16-single * Renamed seed files: mysql-seed.sql -> seed-mysql.sql, pgsql-seed.sql -> seed-pgsql.sql * Deleted legacy docker-compose.yml, docker-compose-init.bash, docker-compose-destroy.bash * Deleted legacy hooks: pre-proxysql.bash, post-proxysql.bash - Added group-specific MCP configuration: * setup-infras.bash: Configures MCP targets and seeds test data * pre-cleanup.bash: Removes MCP configuration after tests * mcp-config.sql: SQL template for MCP setup * cleanup.sql: SQL template for MCP cleanup * seed-mysql.sql & seed-pgsql.sql: Test data for AI tests - Updated documentation in README.md with usage examples Architecture: - ai is the supergroup (defines infrastructure and shared config) - ai-g1, ai-g2, etc. are subgroups (define test sets in groups.json) - Group-specific hooks live in test/tap/groups/ai/ directory - Infrastructure scripts remain generic and delegate to group hooks	2 months ago
Rene Cannao	aa9cc7481c	Finalize infra migration and security hardening - Migrate and standardize infra-pgsql17-repl to test/infra/. - Secure all bash scripts with set -e and set -o pipefail for immediate error abort. - Implement reliable INFRA_ID preservation and propagation across all init scripts. - Restore all docker-compose.yml literals to prevent premature shell expansion. - Refactor PostgreSQL wait and post-scripts to use docker exec within isolated network. - Prevent stop-proxysql-isolated.bash from accidentally killing the test-runner container. - Update README.md with detailed instructions for all backend types and clusters. - Decouple pgsql17-repl test group from its internal infrastructure management.	2 months ago
Rene Cannao	9ffc3f8d71	mcp tests: add phase-B TAP coverage and optional real Claude CLI E2E runner Add two complementary TAP tests for phase-B validation and an optional real Claude CLI E2E helper, so we can validate both 'without Claude credentials' and 'with real Claude CLI' workflows. What was added: 1) CI-safe deterministic phase-B TAP - New: test/tap/tests/test_mcp_llm_discovery_phaseb-t.sh - Validates MCP phase-B primitives end-to-end without external LLM API: - list_targets - discovery.run_static (target_id-scoped setup) - catalog.list_objects - agent.run_start / agent.run_finish - llm.summary_upsert / llm.summary_get - llm.domain_upsert / llm.domain_set_members - llm.metric_upsert - llm.question_template_add - llm.search - Uses unique per-run markers to assert persisted artifacts are retrievable 2) Claude headless flow TAP smoke - New: test/tap/tests/test_mcp_claude_headless_flow-t.sh - Always validates integration path without external dependencies: - static_harvest.sh wrapper executes and yields run_id - two_phase_discovery.py --dry-run executes with target_id/run_id context - Optional real Claude execution: - enabled via TAP_RUN_REAL_CLAUDE=1 - skipped by default to keep CI deterministic 3) Manual real-CLI E2E runner - New: scripts/mcp/DiscoveryAgent/ClaudeCode_Headless/run_real_claude_e2e.sh - Runs full two-step flow manually when credentials/CLI are available: - phase-A static harvest (or --skip-phase-a + --run-id) - phase-B real Claude run via two_phase_discovery.py 4) Documentation updates - scripts/mcp/DiscoveryAgent/ClaudeCode_Headless/README.md: - documents run_real_claude_e2e.sh usage - test/tap/groups/ai/README.md: - adds manual run instructions for: - phase-A static harvest test - phase-B deterministic TAP test - Claude headless smoke (with optional real mode) Validation run: - bash -n: - test_mcp_llm_discovery_phaseb-t.sh - test_mcp_claude_headless_flow-t.sh - run_real_claude_e2e.sh - static_harvest.sh - python3 -m py_compile: - two_phase_discovery.py	3 months ago
Rene Cannao	2538e303cf	tap ai: add dual-backend static-harvest fixtures and target_id coverage test Implement phase-A (static harvesting) TAP coverage for MCP multi-target discovery by seeding deterministic schemas on both MySQL and PostgreSQL and validating discovery/catalog behavior per target_id. What this commit adds: - AI group deterministic seed datasets - Added test/tap/groups/ai/mysql-seed.sql with: - tap_mysql_static_customers - tap_mysql_static_orders (FK to customers) - Added test/tap/groups/ai/pgsql-seed.sql with: - tap_pgsql_static_accounts - tap_pgsql_static_events (FK to accounts) - pre-proxysql hook integration - Updated test/tap/groups/ai/pre-proxysql.bash to seed both backends after container startup: - seed_mysql_test_data() executes mysql-seed.sql via mysql CLI - seed_pgsql_test_data() executes pgsql-seed.sql via psql (or docker compose exec fallback) - Existing monitor-user/profile setup is preserved - New TAP test: test/tap/tests/test_mcp_static_harvest-t.sh - Validates MCP/ProxySQL reachability - Validates list_targets exposes both mysql and pgsql target_id entries - Runs discovery.run_static for MySQL target_id and validates run_id + protocol=mysql - Validates catalog.list_objects returns seeded MySQL table for that run - Runs discovery.run_static for PostgreSQL target_id and validates run_id + protocol=pgsql - Validates catalog.list_objects returns seeded PostgreSQL table for that run - Validates run isolation across targets (cross-target run_id lookup fails as expected) - Documentation update - Updated test/tap/groups/ai/README.md with seeded-table details and manual run instructions for the new static-harvest test Notes: - This commit focuses strictly on phase-A static harvesting, as requested. - Phase-B (LLM-driven discovery) tests are intentionally not included here.	3 months ago
Rene Cannao	998bd82387	MCP TAP startup: fix tool-handler initialization order, improve MCP PROFILES observability, and seed monitor users This change fixes recurring MCP TAP failures where `/mcp/query` returned: Tool Handler not initialized for endpoint: query and where backend monitor auth failures flooded logs. Problem summary - MCP server startup can occur before runtime target/auth profiles and backend server mappings are loaded. - If that happens, Query_Tool_Handler initialization sees no executable targets and remains NULL. - MCP endpoint resources bind the handler pointer at creation time, so a NULL query handler at startup breaks `/mcp/query` until server restart. Code changes 1) Add explicit admin command logging for MCP PROFILES commands - Added `Received <command>` logging in the MCP PROFILES command block, matching behavior of other admin command handlers. - File: `lib/Admin_Handler.cpp` 2) Trigger MCP server refresh after `LOAD MCP PROFILES TO RUNTIME` - After copying profiles into runtime and rebuilding target/auth map, call `ProxySQL_Admin::load_mcp_server()`. - This allows MCP to self-heal when profiles become available after initial startup. - File: `lib/Admin_Handler.cpp` 3) Restart MCP server when query handler is missing - Extended `ProxySQL_Admin::load_mcp_server()` restart checks to include: - running server + `query_tool_handler == NULL` - Restart reason now includes tool handler initialization mismatch. - File: `lib/ProxySQL_Admin.cpp` 4) Fix TAP configurator load order to avoid early MCP startup - Reordered `test/tap/tests/mcp_rules_testing/configure_mcp.sh` runtime sequence: - `LOAD MYSQL SERVERS TO RUNTIME` - `LOAD PGSQL SERVERS TO RUNTIME` (best effort) - `LOAD MCP PROFILES TO RUNTIME` - `LOAD MCP VARIABLES TO RUNTIME` (last) - This ensures MCP starts only after routing/auth context is present. 5) Seed monitor credentials in AI local infra pre-hook - Added backend user/role creation for default monitor credentials `monitor/monitor`: - MySQL: create user + monitor-relevant grants - PostgreSQL: create role + `pg_monitor` + DB connect grants - Reduces monitor auth noise in local AI TAP dockerized setup. - File: `test/tap/groups/ai/pre-proxysql.bash` 6) Mark new TAP phase scripts executable - `test_phase10_eval_explain.sh` - `test_phase11_pgsql_target.sh` Expected outcome - MCP query endpoint no longer stays stuck with an uninitialized tool handler after TAP configuration. - MCP query-rules admin commands stop failing due to missing Query_Tool_Handler. - MCP profile command flow is visible in logs for easier debugging. - Local AI TAP infra no longer emits continuous monitor authentication failures for default monitor credentials.	3 months ago
Rene Cannao	af0411bd46	MCP: add target-aware rules/stats tests, explain_sql rule coverage, and AI local docker TAP infra This commit completes end-to-end MCP query-rules validation for multi-target routing and introduces a self-contained TAP infra for the `ai` group that can run both in Jenkins and manually. Main MCP/runtime changes: - Extended MCP query-rule matching context to include both `target_id` and resolved backend `username`. - Added `target_id` column to `mcp_query_rules` and `runtime_mcp_query_rules` table definitions. - Extended `stats_mcp_query_rules` to include `username` and `target_id` alongside `rule_id` and `hits`. - Updated load/save/runtime refresh paths to persist and rehydrate the expanded MCP rule schema. - Wired the rule engine into `explain_sql` so MCP rules apply consistently across `run_sql_readonly` and `explain_sql`. - Included startup-order fix in `src/main.cpp` to initialize MCP/GenAI thread handlers early, preventing startup crashes in PROXYSQLGENAI builds. Test coverage changes: - Updated existing MCP TAP phases to assert target-aware and username-aware behavior: - `test_phase4_stats.sh` - `test_phase6_eval_block.sh` - Added new MCP TAP phases: - `test_phase10_eval_explain.sh` (rule engine coverage for `explain_sql`) - `test_phase11_pgsql_target.sh` (pgsql target routing/rule/stats coverage; graceful skip if no pgsql target is configured) - Updated `test_mcp_query_rules-t.sh` runner to execute new phases. AI group isolated infra (manual + CI compatible): - Added `test/tap/groups/ai/docker-compose.yml` with MySQL 9.0 and PostgreSQL 16 backends. - Added lifecycle scripts: - `docker-compose-init.bash` - `docker-compose-destroy.bash` - `pre-proxysql.bash` - `post-proxysql.bash` - Extended `test/tap/groups/ai/env.sh` with local default ports/credentials/target IDs used by MCP TAP tests. - Added `test/tap/groups/ai/README.md` documenting manual execution flow outside Jenkins. Outcome: - MCP tests now validate routing-aware rule enforcement and stats attribution for both MySQL and PostgreSQL targets. - The `ai` TAP group can be run with an isolated local backend stack without relying on external Jenkins infra repositories.	3 months ago
Rene Cannao	70c4049012	Add test group environment configurations	3 months ago

8 Commits (mysqlx-plugin-impl)