From 9d2adf2d6486040ed169f23b6cff03878c51c34b Mon Sep 17 00:00:00 2001 From: Richard McDaniel <1130888+rmcdaniel@users.noreply.github.com> Date: Tue, 17 Nov 2026 22:55:31 +0000 Subject: [PATCH] Embed native Server 3.12.0 in the development Server Move the built-in development Server to the published Server 3.12.0 tag commit da655a85, so `dw server:start-dev` advertises capabilities.workflow_version_usage for `dw workflow:version-usage`. Server 3.12.0 uses native schema 15 and its startup refuses an earlier schema with native_schema_upgrade_required. The development Server holds its own data directory exclusively, so when it finds an earlier upgradable schema there it now runs the Server's own schema_upgrade::upgrade_sqlite on that database, prints the versions, and starts. A newer schema still refuses, now with a message that says what to do. Tests start a data directory written by the published CLI 2.9.0 binary (schema 14, with one started workflow), and a schema-99 marker. Co-Authored-By: Claude Opus 5.5 --- README.md | 7 +- rust/Cargo.lock | 9 +- rust/Cargo.toml | 11 +- rust/src/commands/start_dev.rs | 49 ++++++++- ...dev-server-cli-2.9.0-schema-14.sqlite.zlib | Bin 0 -> 34942 bytes .../fixtures/dev-server-schema-99.sqlite.zlib | Bin 0 -> 209 bytes rust/tests/start_dev.rs | 101 +++++++++++++++++- 7 files changed, 164 insertions(+), 13 deletions(-) create mode 100644 rust/tests/fixtures/dev-server-cli-2.9.0-schema-14.sqlite.zlib create mode 100644 rust/tests/fixtures/dev-server-schema-99.sqlite.zlib diff --git a/README.md b/README.md index f7fef97..009966c 100644 --- a/README.md +++ b/README.md @@ -62,8 +62,11 @@ dw doctor Data persists in `dev-server` under the CLI config directory. Use `--data-dir=./workflow-data` to choose a directory or `--port=9000` to choose a -port. Ctrl+C stops the runtime and preserves its data. Application workers -still run your workflow and activity code through an SDK. +port. Ctrl+C stops the runtime and preserves its data. When a newer `dw` +finds data written by an earlier one, it upgrades that development database +in place and prints the schema versions; an older `dw` refuses data written by +a newer one. Application workers still run your workflow and activity code +through an SDK. ## Connect diff --git a/rust/Cargo.lock b/rust/Cargo.lock index c7c7089..834d660 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -56,7 +56,7 @@ dependencies = [ [[package]] name = "apache-avro" version = "0.22.0" -source = "git+https://github.com/durable-workflow/server?rev=3d90086f73533ac4437735bae6b9d0446558577c#3d90086f73533ac4437735bae6b9d0446558577c" +source = "git+https://github.com/durable-workflow/server?rev=da655a8500691d6ce8e018d1552801491a696135#da655a8500691d6ce8e018d1552801491a696135" dependencies = [ "bigdecimal", "bon", @@ -487,7 +487,7 @@ dependencies = [ [[package]] name = "durable-workflow-server" version = "0.0.0" -source = "git+https://github.com/durable-workflow/server?rev=3d90086f73533ac4437735bae6b9d0446558577c#3d90086f73533ac4437735bae6b9d0446558577c" +source = "git+https://github.com/durable-workflow/server?rev=da655a8500691d6ce8e018d1552801491a696135#da655a8500691d6ce8e018d1552801491a696135" dependencies = [ "apache-avro 0.22.0", "axum", @@ -525,6 +525,7 @@ dependencies = [ "durable-workflow-server", "getrandom 0.2.17", "libc", + "miniz_oxide 0.9.1", "rcgen", "reqwest", "rustls", @@ -2016,7 +2017,7 @@ dependencies = [ [[package]] name = "sqlx-mysql" version = "0.9.0" -source = "git+https://github.com/durable-workflow/server?rev=3d90086f73533ac4437735bae6b9d0446558577c#3d90086f73533ac4437735bae6b9d0446558577c" +source = "git+https://github.com/durable-workflow/server?rev=da655a8500691d6ce8e018d1552801491a696135#da655a8500691d6ce8e018d1552801491a696135" dependencies = [ "bitflags", "byteorder", @@ -2042,7 +2043,7 @@ dependencies = [ [[package]] name = "sqlx-postgres" version = "0.9.0" -source = "git+https://github.com/durable-workflow/server?rev=3d90086f73533ac4437735bae6b9d0446558577c#3d90086f73533ac4437735bae6b9d0446558577c" +source = "git+https://github.com/durable-workflow/server?rev=da655a8500691d6ce8e018d1552801491a696135#da655a8500691d6ce8e018d1552801491a696135" dependencies = [ "atoi", "base64 0.22.1", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index f9ee5f5..20d4fab 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -15,7 +15,7 @@ path = "src/main.rs" [dependencies] # Native development Server, built into every standalone dw binary. Keep its # dependency patches on this exact source revision as well. -durable-workflow-server = { git = "https://github.com/durable-workflow/server", rev = "3d90086f73533ac4437735bae6b9d0446558577c" } +durable-workflow-server = { git = "https://github.com/durable-workflow/server", rev = "da655a8500691d6ce8e018d1552801491a696135" } axum = { version = "=0.8.9", default-features = false, features = ["http1", "tokio"] } # Published 4.18.0 carries sdk-rust#279: without its default msrv-1-86 # feature the SDK composes with the native Server's newer Avro dependency. @@ -34,6 +34,9 @@ tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros", "net", " reqwest = { version = "0.12", default-features = false, features = ["rustls-tls"] } [dev-dependencies] +# Inflates the compressed development database fixtures; already in the +# graph through the native Server. +miniz_oxide = "0.9" # A self-signed HTTPS Server for the --tls-verify tests, on the ring provider # reqwest already uses. rcgen = { version = "0.13", default-features = false, features = ["ring", "pem"] } @@ -56,9 +59,9 @@ strip = "symbols" # Cargo only applies patches from the top-level manifest. These are the # reviewed Server dependency sources, including its Avro and SQL adapters. [patch.crates-io] -apache-avro = { git = "https://github.com/durable-workflow/server", rev = "3d90086f73533ac4437735bae6b9d0446558577c" } -sqlx-mysql = { git = "https://github.com/durable-workflow/server", rev = "3d90086f73533ac4437735bae6b9d0446558577c" } -sqlx-postgres = { git = "https://github.com/durable-workflow/server", rev = "3d90086f73533ac4437735bae6b9d0446558577c" } +apache-avro = { git = "https://github.com/durable-workflow/server", rev = "da655a8500691d6ce8e018d1552801491a696135" } +sqlx-mysql = { git = "https://github.com/durable-workflow/server", rev = "da655a8500691d6ce8e018d1552801491a696135" } +sqlx-postgres = { git = "https://github.com/durable-workflow/server", rev = "da655a8500691d6ce8e018d1552801491a696135" } [profile.dev] debug = 0 diff --git a/rust/src/commands/start_dev.rs b/rust/src/commands/start_dev.rs index d00511a..b3681cb 100644 --- a/rust/src/commands/start_dev.rs +++ b/rust/src/commands/start_dev.rs @@ -4,12 +4,14 @@ use super::start_dev_data::Data; use crate::cli::Input; use crate::error::CliError; use crate::{config, formatter}; -use durable_workflow_server::runtime::{router, Runtime}; +use durable_workflow_server::runtime::{router, schema_upgrade, Runtime, RuntimeError}; use std::net::{IpAddr, Ipv4Addr, SocketAddr}; use std::path::PathBuf; use std::time::Duration; const DEVELOPMENT_TOKEN: &str = "dev-token"; +// Relative to the held data directory, which `Data::enter` made current. +const DATABASE: &str = "database.sqlite"; const SHUTDOWN_GRACE: Duration = Duration::from_secs(5); struct Settings { @@ -107,6 +109,49 @@ async fn stopped() -> i32 { } } +/// Open the development database. Native startup never upgrades a schema, +/// but this Server holds its own data directory exclusively, so an earlier +/// native schema found there is upgraded in place with the Server's own +/// SQLite upgrade before the runtime opens it. A newer schema still refuses. +async fn open(data: &Data, token: &str) -> Result { + match Runtime::open(DATABASE, token.to_owned()).await { + Err(RuntimeError::Refused { + reason: "native_schema_upgrade_required", + .. + }) => {} + result => return result.map_err(open_error), + } + data.verify().map_err(data_error)?; + let report = schema_upgrade::upgrade_sqlite(DATABASE) + .await + .map_err(|error| { + CliError::Failure(format!("Cannot upgrade the development database: {error}")) + })?; + data.verify().map_err(data_error)?; + if report["status"] == "upgraded" { + formatter::writeln_out(&format!( + "Upgraded the development database from schema {} to {}.", + report["from_schema_version"], report["schema_version"] + )); + } + Runtime::open(DATABASE, token.to_owned()) + .await + .map_err(open_error) +} + +fn open_error(error: RuntimeError) -> CliError { + match error { + RuntimeError::Refused { + reason: reason @ "native_schema_newer_than_binary", + .. + } => CliError::Failure(format!( + "Cannot open development database: it was written by a newer dw ({reason}). \ + Start it with that newer dw, or move the data directory aside or choose another --data-dir to start fresh." + )), + error => CliError::Failure(format!("Cannot open development database: {error}")), + } +} + async fn serve(settings: Settings, mut data: Data) -> Result { let shutdown = stopped(); tokio::pin!(shutdown); @@ -125,7 +170,7 @@ async fn serve(settings: Settings, mut data: Data) -> Result { .map_err(|error| CliError::Failure(error.to_string()))?; data.prepare_database().map_err(data_error)?; let runtime = tokio::select! { - result = Runtime::open("database.sqlite", settings.token.clone()) => result.map_err(|error| CliError::Failure(format!("Cannot open development database: {error}")))?, + result = open(&data, &settings.token) => result?, code = &mut shutdown => return Ok(code), }; if let Err(error) = data.verify() { diff --git a/rust/tests/fixtures/dev-server-cli-2.9.0-schema-14.sqlite.zlib b/rust/tests/fixtures/dev-server-cli-2.9.0-schema-14.sqlite.zlib new file mode 100644 index 0000000000000000000000000000000000000000..94638ff387287a0bd150300bb40fb435b659cd75 GIT binary patch literal 34942 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 LNNS@amODD@)?#U3 literal 0 HcmV?d00001 diff --git a/rust/tests/start_dev.rs b/rust/tests/start_dev.rs index cbc371f..3954c47 100644 --- a/rust/tests/start_dev.rs +++ b/rust/tests/start_dev.rs @@ -207,7 +207,18 @@ fn starts_in_an_empty_directory_with_bundled_sqlite_and_real_cli_admission() { assert_eq!(ready["development"], true); assert_eq!(server.get("/api/cluster/info", None).0, 401); let cluster = project.client(&server, &["server:info"]); - assert!(cluster.get("capabilities").is_some()); + assert_eq!(cluster["capabilities"]["workflow_version_usage"], true); + let usage = project.client( + &server, + &[ + "workflow:version-usage", + "dev.example", + "change-a", + "--min-version=2", + ], + ); + assert_eq!(usage["counts"]["total"], 0, "{usage}"); + assert_eq!(usage["runs"], serde_json::json!([]), "{usage}"); let started = project.client( &server, &[ @@ -265,6 +276,94 @@ fn restart_preserves_workflow_data_and_releases_the_directory_lock() { second.stop(); } +/// A development database written by the published CLI 2.9.0 binary (native +/// schema 14): `dw server:start-dev --data-dir X --port 0`, then +/// `dw workflow:start --type=dev.upgrade --workflow-id=before-upgrade +/// --input='{"kept":true}'` and SIGTERM. Stored zlib-compressed. +const CLI_2_9_0_DATABASE: &[u8] = + include_bytes!("fixtures/dev-server-cli-2.9.0-schema-14.sqlite.zlib"); +/// A native ownership marker at schema 99, newer than any binary knows. +const NEWER_DATABASE: &[u8] = include_bytes!("fixtures/dev-server-schema-99.sqlite.zlib"); + +/// Create a data directory with this dw, then replace its database contents +/// in place, keeping the private file the Server created. +fn data_directory_with(project: &Project, fixture: &[u8]) -> (PathBuf, Vec) { + let directory = project.0.join("data"); + let mut server = DevServer::start(project, &["--data-dir", directory.to_str().unwrap()]); + server.stop(); + let database = miniz_oxide::inflate::decompress_to_vec_zlib(fixture).unwrap(); + fs::write(directory.join("database.sqlite"), &database).unwrap(); + (directory, database) +} + +#[test] +fn development_database_from_cli_2_9_0_is_upgraded_in_place_with_its_data() { + let project = Project::new(); + let (directory, _) = data_directory_with(&project, CLI_2_9_0_DATABASE); + let args = ["--data-dir", directory.to_str().unwrap()]; + let mut upgraded = DevServer::start(&project, &args); + let described = project.client(&upgraded, &["workflow:describe", "before-upgrade"]); + assert_eq!(described["run_id"], "01M7NVAVQN0FTYF4ND5GSGAADA"); + assert_eq!(described["workflow_type"], "dev.upgrade"); + assert_eq!(described["status"], "pending"); + assert_eq!(described["input"], serde_json::json!([true])); + let cluster = project.client(&upgraded, &["server:info"]); + assert_eq!(cluster["capabilities"]["workflow_version_usage"], true); + project.client( + &upgraded, + &[ + "workflow:start", + "--type=dev.upgrade", + "--workflow-id=after-upgrade", + "--input=null", + ], + ); + upgraded.stop(); + let text = upgraded.text.lock().unwrap().clone(); + assert_eq!( + text.matches("Upgraded the development database from schema 14 to 15.") + .count(), + 1, + "{text}" + ); + assert!( + text.find("Upgraded the development database").unwrap() + < text.find("listening on").unwrap() + ); + + let mut current = DevServer::start(&project, &args); + for id in ["before-upgrade", "after-upgrade"] { + let described = project.client(¤t, &["workflow:describe", id]); + assert_eq!(described["workflow_id"], id); + } + current.stop(); + assert!(!current.text.lock().unwrap().contains("Upgraded")); +} + +#[test] +fn newer_development_schema_refuses_without_changing_the_database() { + let project = Project::new(); + let (directory, database) = data_directory_with(&project, NEWER_DATABASE); + let output = project.run(&[ + "server:start-dev", + "--port=0", + "--data-dir", + directory.to_str().unwrap(), + ]); + assert_eq!(output.status.code(), Some(1)); + let stderr = String::from_utf8_lossy(&output.stderr); + assert!(stderr.contains("written by a newer dw"), "{stderr}"); + assert!( + stderr.contains("native_schema_newer_than_binary"), + "{stderr}" + ); + assert!(!String::from_utf8_lossy(&output.stdout).contains("listening on")); + assert_eq!( + fs::read(directory.join("database.sqlite")).unwrap(), + database + ); +} + #[test] fn same_data_directory_cannot_start_two_runtimes() { let project = Project::new();