Merge branch 'main' into dap/tld-clients

oxidecomputer · Oct 5, 2023 · 448e4e5 · 448e4e5
2 parents c1141bb + 6cf8181
commit 448e4e5
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 11 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,9 +17,9 @@ members = [
     "clients/wicketd-client",
     "common",
     "crdb-seed",
-    "deploy",
     "dev-tools/omdb",
     "dev-tools/omicron-dev",
+    "dev-tools/thing-flinger",
     "dev-tools/xtask",
     "dns-server",
     "end-to-end-tests",
@@ -83,9 +83,9 @@ default-members = [
     "clients/sled-agent-client",
     "clients/wicketd-client",
     "common",
-    "deploy",
     "dev-tools/omdb",
     "dev-tools/omicron-dev",
+    "dev-tools/thing-flinger",
     "dev-tools/xtask",
     "dns-server",
     "gateway-cli",

diff --git a/deploy/.gitignore → dev-tools/thing-flinger/.gitignore b/deploy/.gitignore → dev-tools/thing-flinger/.gitignore
diff --git a/deploy/Cargo.toml → dev-tools/thing-flinger/Cargo.toml b/deploy/Cargo.toml → dev-tools/thing-flinger/Cargo.toml
diff --git a/deploy/README.adoc → dev-tools/thing-flinger/README.adoc b/deploy/README.adoc → dev-tools/thing-flinger/README.adoc
diff --git a/deploy/src/bin/deployment-example.toml → ...g-flinger/src/bin/deployment-example.toml b/deploy/src/bin/deployment-example.toml → ...g-flinger/src/bin/deployment-example.toml
diff --git a/deploy/src/bin/thing-flinger.rs → ...ls/thing-flinger/src/bin/thing-flinger.rs b/deploy/src/bin/thing-flinger.rs → ...ls/thing-flinger/src/bin/thing-flinger.rs
diff --git a/nexus/tests/integration_tests/schema.rs b/nexus/tests/integration_tests/schema.rs
@@ -62,6 +62,47 @@ async fn test_setup<'a>(
     builder
 }
 
+// Attempts to apply an update as a transaction.
+//
+// Only returns an error if the transaction failed to commit.
+async fn apply_update_as_transaction_inner(
+    client: &omicron_test_utils::dev::db::Client,
+    sql: &str,
+) -> Result<(), tokio_postgres::Error> {
+    client.batch_execute("BEGIN;").await.expect("Failed to BEGIN transaction");
+    client.batch_execute(&sql).await.expect("Failed to execute update");
+    client.batch_execute("COMMIT;").await?;
+    Ok(())
+}
+
+// Applies an update as a transaction.
+//
+// Automatically retries transactions that can be retried client-side.
+async fn apply_update_as_transaction(
+    log: &Logger,
+    client: &omicron_test_utils::dev::db::Client,
+    sql: &str,
+) {
+    loop {
+        match apply_update_as_transaction_inner(client, sql).await {
+            Ok(()) => break,
+            Err(err) => {
+                client
+                    .batch_execute("ROLLBACK;")
+                    .await
+                    .expect("Failed to ROLLBACK failed transaction");
+                if let Some(code) = err.code() {
+                    if code == &tokio_postgres::error::SqlState::T_R_SERIALIZATION_FAILURE {
+                        warn!(log, "Transaction retrying");
+                        continue;
+                    }
+                }
+                panic!("Failed to apply update: {err}");
+            }
+        }
+    }
+}
+
 async fn apply_update(
     log: &Logger,
     crdb: &CockroachInstance,
@@ -87,15 +128,7 @@ async fn apply_update(
 
     for _ in 0..times_to_apply {
         for sql in sqls.iter() {
-            client
-                .batch_execute("BEGIN;")
-                .await
-                .expect("Failed to BEGIN update");
-            client.batch_execute(&sql).await.expect("Failed to execute update");
-            client
-                .batch_execute("COMMIT;")
-                .await
-                .expect("Failed to COMMIT update");
+            apply_update_as_transaction(log, &client, sql).await;
         }
     }