tech-debt(schema-engine-tests): Reduce vitess flakeyness

docker-compose.yml

@@ -294,7 +294,7 @@ services:
       FOREIGN_KEY_MODE: 'disallow'
       ENABLE_ONLINE_DDL: false
       MYSQL_MAX_CONNECTIONS: 100000
-      TABLET_REFRESH_INTERVAL: '500ms'
+      TABLET_REFRESH_INTERVAL: '100ms'
     healthcheck:
       test: ['CMD', 'mysqladmin', 'ping', '-h127.0.0.1', '-P33807']
       interval: 5s

libs/test-setup/src/test_api_args.rs

@@ -2,6 +2,7 @@ use crate::{logging, mssql, mysql, postgres, Capabilities, Tags};
 use enumflags2::BitFlags;
 use once_cell::sync::Lazy;
 use quaint::single::Quaint;
+use std::time::Duration;
 use std::{fmt::Display, io::Write as _};
 
 #[derive(Debug)]
@@ -11,6 +12,7 @@ pub(crate) struct DbUnderTest {
     shadow_database_url: Option<String>,
     provider: &'static str,
     pub(crate) tags: BitFlags<Tags>,
+    pub(crate) max_ddl_refresh_delay: Option<std::time::Duration>,
 }
 
 const MISSING_TEST_DATABASE_URL_MSG: &str = r#"
@@ -23,6 +25,9 @@ Example usage:
 source .test_database_urls/mysql_5_6
 "#;
 
+/// How long to wait for a schema change to propagate in Vitess.
+const VITESS_MAX_REFRESH_DELAY_MS: u64 = 1000;
+
 static DB_UNDER_TEST: Lazy<Result<DbUnderTest, String>> = Lazy::new(|| {
     let database_url = std::env::var("TEST_DATABASE_URL").map_err(|_| MISSING_TEST_DATABASE_URL_MSG.to_owned())?;
     let shadow_database_url = std::env::var("TEST_SHADOW_DATABASE_URL").ok();
@@ -40,13 +45,22 @@ static DB_UNDER_TEST: Lazy<Result<DbUnderTest, String>> = Lazy::new(|| {
             capabilities: Capabilities::CreateDatabase.into(),
             provider: "sqlite",
             shadow_database_url,
+            max_ddl_refresh_delay: None,
         }),
         "mysql" => {
             let tags = mysql::get_mysql_tags(&database_url)?;
             let mut capabilities = Capabilities::Enums | Capabilities::Json;
+            let mut max_refresh_delay = None;
 
             if tags.contains(Tags::Vitess) {
                 capabilities |= Capabilities::CreateDatabase;
+                // Vitess is an eventually consistent system that propagates schema changes
+                // from vttablet to vtgate asynchronously. We might need to wait for a while before
+                // start querying the database after a schema change is made.
+                //
+                // For schema changes that do not alter the table column names, the schema is not
+                // required to be reloaded.
+                max_refresh_delay = Some(Duration::from_millis(VITESS_MAX_REFRESH_DELAY_MS));
             }
 
             Ok(DbUnderTest {
@@ -55,6 +69,7 @@ static DB_UNDER_TEST: Lazy<Result<DbUnderTest, String>> = Lazy::new(|| {
                 capabilities,
                 provider: "mysql",
                 shadow_database_url,
+                max_ddl_refresh_delay: max_refresh_delay,
             })
         }
         "postgresql" | "postgres" => Ok({
@@ -75,6 +90,7 @@ static DB_UNDER_TEST: Lazy<Result<DbUnderTest, String>> = Lazy::new(|| {
                     | Capabilities::CreateDatabase,
                 provider,
                 shadow_database_url,
+                max_ddl_refresh_delay: None,
             }
         }),
         "sqlserver" => Ok(DbUnderTest {
@@ -83,6 +99,7 @@ static DB_UNDER_TEST: Lazy<Result<DbUnderTest, String>> = Lazy::new(|| {
             capabilities: Capabilities::CreateDatabase.into(),
             provider: "sqlserver",
             shadow_database_url,
+            max_ddl_refresh_delay: None,
         }),
         _ => Err("Unknown database URL".into()),
     }
@@ -191,6 +208,10 @@ impl TestApiArgs {
     pub fn tags(&self) -> BitFlags<Tags> {
         self.db.tags
     }
+
+    pub fn max_ddl_refresh_delay(&self) -> Option<Duration> {
+        self.db.max_ddl_refresh_delay
+    }
 }
 
 pub struct DatasourceBlock<'a> {

schema-engine/sql-migration-tests/src/commands/schema_push.rs

@@ -2,6 +2,7 @@ use colored::Colorize;
 use schema_core::{
     commands::schema_push, json_rpc::types::*, schema_connector::SchemaConnector, CoreError, CoreResult,
 };
+use std::time::Duration;
 use std::{borrow::Cow, fmt::Debug};
 use tracing_futures::Instrument;
 
@@ -11,15 +12,18 @@ pub struct SchemaPush<'a> {
     force: bool,
     /// Purely for logging diagnostics.
     migration_id: Option<&'a str>,
+    // In eventually-consistent systems, we might need to wait for a while before the system refreshes
+    max_ddl_refresh_delay: Option<Duration>,
 }
 
 impl<'a> SchemaPush<'a> {
-    pub fn new(api: &'a mut dyn SchemaConnector, schema: String) -> Self {
+    pub fn new(api: &'a mut dyn SchemaConnector, schema: String, max_refresh_delay: Option<Duration>) -> Self {
         SchemaPush {
             api,
             schema,
             force: false,
             migration_id: None,
+            max_ddl_refresh_delay: max_refresh_delay,
         }
     }
 
@@ -44,6 +48,10 @@ impl<'a> SchemaPush<'a> {
 
         let output = test_setup::runtime::run_with_thread_local_runtime(fut)?;
 
+        if let Some(delay) = self.max_ddl_refresh_delay {
+            std::thread::sleep(delay);
+        }
+
         Ok(SchemaPushAssertion {
             result: output,
             context: None,

schema-engine/sql-migration-tests/src/multi_engine_test_api.rs

@@ -3,6 +3,7 @@
 //! A TestApi that is initialized without IO or async code and can instantiate
 //! multiple schema engines.
 
+use std::time::Duration;
 pub use test_macros::test_connector;
 pub use test_setup::sqlite_test_url;
 pub use test_setup::{runtime::run_with_thread_local_runtime as tok, BitFlags, Capabilities, Tags};
@@ -158,6 +159,12 @@ impl TestApi {
         self.tags().contains(Tags::Vitess)
     }
 
+    /// Returns a duration that is guaranteed to be larger than the maximum refresh rate after a
+    /// DDL statement
+    pub(crate) fn max_ddl_refresh_delay(&self) -> Option<Duration> {
+        self.args.max_ddl_refresh_delay()
+    }
+
     /// Returns whether the database automatically lower-cases table names.
     pub fn lower_cases_table_names(&self) -> bool {
         self.tags().contains(Tags::LowerCasesTableNames)
@@ -203,6 +210,7 @@ impl TestApi {
             connection_info,
             tags: self.args.tags(),
             namespaces: self.args.namespaces(),
+            max_ddl_refresh_delay: self.args.max_ddl_refresh_delay(),
         }
     }
 
@@ -276,6 +284,7 @@ pub struct EngineTestApi {
     connection_info: ConnectionInfo,
     tags: BitFlags<Tags>,
     namespaces: &'static [&'static str],
+    max_ddl_refresh_delay: Option<Duration>,
 }
 
 impl EngineTestApi {
@@ -320,7 +329,7 @@ impl EngineTestApi {
 
     /// Plan a `schemaPush` command
     pub fn schema_push(&mut self, dm: impl Into<String>) -> SchemaPush<'_> {
-        SchemaPush::new(&mut self.connector, dm.into())
+        SchemaPush::new(&mut self.connector, dm.into(), self.max_ddl_refresh_delay)
     }
 
     /// The schema name of the current connected database.

schema-engine/sql-migration-tests/src/test_api.rs

@@ -21,6 +21,7 @@ use schema_core::{
 };
 use sql_schema_connector::SqlSchemaConnector;
 use sql_schema_describer::SqlSchema;
+use std::time::Duration;
 use std::{
     borrow::Cow,
     fmt::{Display, Write},
@@ -189,6 +190,12 @@ impl TestApi {
         self.root.is_vitess()
     }
 
+    /// Returns a duration that is guaranteed to be larger than the maximum refresh rate after a
+    /// DDL statement
+    pub fn max_ddl_refresh_delay(&self) -> Option<Duration> {
+        self.root.max_ddl_refresh_delay()
+    }
+
     /// Insert test values
     pub fn insert<'a>(&'a mut self, table_name: &'a str) -> SingleRowInsert<'a> {
         SingleRowInsert {
@@ -316,12 +323,13 @@ impl TestApi {
     /// Plan a `schemaPush` command adding the datasource
     pub fn schema_push_w_datasource(&mut self, dm: impl Into<String>) -> SchemaPush<'_> {
         let schema = self.datamodel_with_provider(&dm.into());
-        SchemaPush::new(&mut self.connector, schema)
+        self.schema_push(schema)
     }
 
     /// Plan a `schemaPush` command
     pub fn schema_push(&mut self, dm: impl Into<String>) -> SchemaPush<'_> {
-        SchemaPush::new(&mut self.connector, dm.into())
+        let max_ddl_refresh_delay = self.max_ddl_refresh_delay();
+        SchemaPush::new(&mut self.connector, dm.into(), max_ddl_refresh_delay)
     }
 
     pub fn tags(&self) -> BitFlags<Tags> {

schema-engine/sql-migration-tests/tests/migrations/sqlite.rs

@@ -182,13 +182,9 @@ fn unique_constraint_errors_in_migrations(api: TestApi) {
         .send_unwrap_err()
         .to_user_facing();
 
-    let expected_json = expect![[r#"
-        {
-          "is_panic": false,
-          "message": "SQLite database error\nUNIQUE constraint failed: Fruit.name\n   0: sql_schema_connector::apply_migration::apply_migration\n             at schema-engine/connectors/sql-schema-connector/src/apply_migration.rs:10\n   1: sql_migration_tests::commands::schema_push::SchemaPush\n           with \u001b[3mmigration_id\u001b[0m\u001b[2m=\u001b[0mSome(\"the-migration\")\n             at schema-engine/sql-migration-tests/src/commands/schema_push.rs:43",
-          "backtrace": null
-        }"#]];
-    expected_json.assert_eq(&serde_json::to_string_pretty(&res).unwrap())
+    assert!(serde_json::to_string_pretty(&res)
+        .unwrap()
+        .contains("UNIQUE constraint failed: Fruit.name"));
 }
 
 #[test]