From a519420232d01aae121d5b63e07e14f47dd8477f Mon Sep 17 00:00:00 2001 From: Marcelo Altmann Date: Tue, 29 Oct 2024 11:58:37 -0700 Subject: [PATCH] more placeholder adjustments Add more rules to replace_placeholders to remove "..." from digest coming from proxysql. Fixed warmup_time config in .cnf file. --- Cargo.lock | 2 +- README.md | 8 ++++---- readyset_proxysql_scheduler.cnf | 2 +- src/queries.rs | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 00cd19a..d9b06ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1275,7 +1275,7 @@ dependencies = [ [[package]] name = "readyset_proxysql_scheduler" -version = "0.1.0" +version = "0.3.0" dependencies = [ "chrono", "clap", diff --git a/README.md b/README.md index 1245009..04d552f 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ This scheduler executes the following steps: 2. If `mode=(All|HealthCheck)` - Query `mysql_servers` and check all servers that have `comment='Readyset` (case insensitive) and `hostgroup=readyset_hostgroup`. For each server it checks if it can connect to Readyset and validate if `Snapshot Status` is `Completed`. In case it cannot connect or Readyset is still performing snapshot it adjust the server status to `SHUNNED` in ProxySQL. 3. If `mode=(All|QueryDiscovery)` Query the table `stats_mysql_query_digest` finding queries executed at `source_hostgroup` by `readyset_user` and validates if each query is supported by Readyset. The rules to order queries are configured by [Query Discovery](#query-discovery) configurations. 3. If the query is supported it adds a cache in Readyset by executing `CREATE CACHE FROM __query__`. -4. If `warmup_time` is NOT configure, a new query rule will be added redirecting this query to Readyset -5. If `warmup_time` is configured, a new query rule will be added to mirror this query to Readyset. The query will still be redirected to the original hostgroup -6. Once `warmup_time` seconds has elapsed since the query was mirrored, the query rule will be updated to redirect the query to Readyset instead of mirroring. +4. If `warmup_time_s` is NOT configure, a new query rule will be added redirecting this query to Readyset +5. If `warmup_time_s` is configured, a new query rule will be added to mirror this query to Readyset. The query will still be redirected to the original hostgroup +6. Once `warmup_time_s` seconds has elapsed since the query was mirrored, the query rule will be updated to redirect the query to Readyset instead of mirroring. @@ -44,7 +44,7 @@ Configure `/etc/readyset_proxysql_scheduler.cnf` as follow: * `readyset_password` - (Required) - Readyset application password * `source_hostgroup` - (Required) - Hostgroup running your Read workload * `readyset_hostgroup` - (Required) - Hostgroup where Readyset is configure -* `warmup_time` - (Optional) - Time in seconds to mirror a query supported before redirecting the query to Readyset (Default 0 - no mirror) +* `warmup_time_s` - (Optional) - Time in seconds to mirror a query supported before redirecting the query to Readyset (Default 0 - no mirror) * `lock_file` - (Optional) - Lock file to prevent two instances of the scheduler to run at the same time (Default '/etc/readyset_scheduler.lock') * `operation_mode` - (Optional) - Operation mode to run the scheduler. The options are described in [Operation Mode](#operation-mode) (Default All). * `number_of_queries` - (Optional) - Number of queries to cache in Readyset (Default 10). diff --git a/readyset_proxysql_scheduler.cnf b/readyset_proxysql_scheduler.cnf index f4654b8..054df84 100644 --- a/readyset_proxysql_scheduler.cnf +++ b/readyset_proxysql_scheduler.cnf @@ -6,7 +6,7 @@ readyset_user = 'root' readyset_password = 'root' source_hostgroup = 11 readyset_hostgroup = 99 -warmup_time = 60 +warmup_time_s = 60 lock_file = '/tmp/readyset_scheduler.lock' operation_mode="All" number_of_queries=10 diff --git a/src/queries.rs b/src/queries.rs index a8b738e..6af18c5 100644 --- a/src/queries.rs +++ b/src/queries.rs @@ -244,7 +244,7 @@ impl QueryDiscovery { rows.iter() .map(|(digest_text, digest, schema)| { Query::new( - digest_text.to_string(), + self.replace_placeholders(digest_text), digest.to_string(), schema.to_string(), self.readyset_user.clone(), @@ -257,6 +257,7 @@ impl QueryDiscovery { fn replace_placeholders(&self, query: &str) -> String { // date placeholder - query.replace("?-?-?", "?") + // multiple placeholders + query.replace("?,?,?,...", "?,?,?").replace("?-?-?", "?") } }