Merge branch 'master' into update-tokio-tungstenite-for-performance

Author: kim

.github/workflows/ci.yml

@@ -61,8 +61,7 @@ jobs:
         if: runner.os == 'Windows'
       - name: Run smoketests
         # Note: clear_database and replication only work in private
-        # zz_docker disabled temporarily until https://github.com/clockworklabs/SpacetimeDB/issues/2965
-        run: python -m smoketests ${{ matrix.smoketest_args }} -x clear_database replication zz_docker
+        run: python -m smoketests ${{ matrix.smoketest_args }} -x clear_database replication
       - name: Stop containers (Linux)
         if: always() && runner.os == 'Linux'
         run: docker compose down

Cargo.lock

@@ -257,7 +257,7 @@ syntect = { version = "5.0.0", default-features = false, features = ["default-fa
 tabled = "0.14.0"
 tar = "0.4"
 tempdir = "0.3.7"
-tempfile = "3.8"
+tempfile = "3.20"
 termcolor = "1.2.0"
 thin-vec = "0.2.13"
 thiserror = "1.0.37"
@@ -293,7 +293,7 @@ windows-sys = "0.59"
 xdg = "2.5"
 tikv-jemallocator = { version = "0.6.0", features = ["profiling", "stats"] }
 tikv-jemalloc-ctl = { version = "0.6.0", features = ["stats"] }
-jemalloc_pprof = { version = "0.7", features = ["symbolize", "flamegraph"] }
+jemalloc_pprof = { version = "0.8", features = ["symbolize", "flamegraph"] }
 zstd-framed = { version = "0.1.1", features = ["tokio"] }
 
 # Vendor the openssl we rely on, rather than depend on a

Cargo.toml

@@ -1708,7 +1708,7 @@ pub mod tests_utils {
     impl TempReplicaDir {
         pub fn new() -> io::Result<Self> {
             let dir = TempDir::with_prefix("stdb_test")?;
-            Ok(Self(ReplicaDir::from_path_unchecked(dir.into_path())))
+            Ok(Self(ReplicaDir::from_path_unchecked(dir.keep())))
         }
     }
     impl Deref for TempReplicaDir {

crates/core/src/db/relational_db.rs

@@ -527,7 +527,7 @@ mod test {
     /// An `InstanceEnv` requires a `DatabaseLogger`
     fn temp_logger() -> Result<DatabaseLogger> {
         let temp = TempDir::new()?;
-        let path = ModuleLogsDir::from_path_unchecked(temp.into_path());
+        let path = ModuleLogsDir::from_path_unchecked(temp.keep());
         let path = path.today();
         Ok(DatabaseLogger::open(path))
     }

crates/core/src/host/instance_env.rs

@@ -85,7 +85,7 @@ impl VersionBinDir {
     }
 
     fn link_to(&self, path: &Path) -> anyhow::Result<()> {
-        let rel_path = path.strip_prefix(self).unwrap_or(path);
+        let rel_path = path.strip_prefix(self.0.parent().unwrap()).unwrap_or(path);
         #[cfg(unix)]
         {
             // remove the link if it already exists

crates/paths/src/cli.rs

@@ -22,7 +22,7 @@ pub fn ensure_standalone_process() -> &'static SpacetimePaths {
             // TODO: This leaks the tempdir.
             //       We need the tempdir to live for the duration of the process,
             //       and all the options for post-`main` cleanup seem sketchy.
-            .into_path();
+            .keep();
         SpacetimePaths::from_root_dir(&RootDir(dir))
     });
 

crates/testing/src/sdk.rs

@@ -1,4 +1,5 @@
 use spacetimedb_paths::SpacetimePaths;
+use std::path::Path;
 
 /// List installed SpacetimeDB versions.
 #[derive(clap::Args)]
@@ -10,7 +11,31 @@ pub(super) struct List {
 
 impl List {
     pub(super) fn exec(self, paths: &SpacetimePaths) -> anyhow::Result<()> {
-        let current = paths.cli_bin_dir.current_version()?;
+        // This `match` part is only here because at one point we had a bug where we were creating
+        // symlinks that contained the _entire_ path, rather than just the relative path to the
+        // version directory. It's not strictly necessary, it just fixes our determination of what
+        // the current version is, for the output of this command.
+        //
+        // That symlink bug was fixed in `crates/paths/src/cli.rs` in
+        // https://github.com/clockworklabs/SpacetimeDB/pull/2680, but this `match` means that this
+        // output will still be correct for any users that already have one of the bugged symlinks.
+        //
+        // Once users upgrade to a version containing #2680, they will have the code that creates
+        // the fixed symlinks. However, that code won't immediately run, since the upgrade will be
+        // running from the previous binary they had. So once they upgrade to a version containing
+        // #2680, _and then_ upgrade once more, their symlinks will be fixed. There's no real
+        // timeline on when everyone will have done that, but hopefully that helps give a sense of
+        // how long this code "should" exist for (but it doesn't do any harm afaik).
+        let current = match paths.cli_bin_dir.current_version()? {
+            None => None,
+            Some(path_str) => {
+                let file_name = Path::new(&path_str)
+                    .file_name()
+                    .and_then(|f| f.to_str())
+                    .ok_or(anyhow::anyhow!("Could not extract current version"))?;
+                Some(file_name.to_string())
+            }
+        };
         let versions = if self.all {
             let client = super::reqwest_client()?;
             super::tokio_block_on(super::install::available_releases(&client))??

crates/update/src/cli/list.rs

@@ -1,7 +1,7 @@
-version: "3.6"
-
 services:
   node:
+    labels:
+      app: spacetimedb
     build:
       context: ./
       dockerfile: ./crates/standalone/Dockerfile
@@ -28,8 +28,6 @@ services:
       # Tracy
       - "8086:8086"
     entrypoint: cargo watch -i flamegraphs -i log.conf --why -C crates/standalone -x 'run start --data-dir=/stdb/data --jwt-pub-key-path=/etc/spacetimedb/id_ecdsa.pub --jwt-priv-key-path=/etc/spacetimedb/id_ecdsa'
-    healthcheck:
-      test: curl -f http://localhost/ping || exit 1
     privileged: true
     environment:
       SPACETIMEDB_FLAMEGRAPH_PATH: ../../../../flamegraphs/flamegraph.folded