From 281cd7bc8b903b8809b840b8e55df0b962eef787 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Thu, 4 Apr 2024 01:10:38 +0200 Subject: [PATCH] fix: improve locking --- Dockerfile | 2 +- backend/windmill-api/src/db.rs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4b0a7b9277..70a134706b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -165,7 +165,7 @@ ENV GO_PATH=/usr/local/go/bin/go RUN apt-get -y update && apt-get install -y curl nodejs npm # go build is slower the first time it is ran, so we prewarm it in the build -RUN mkdir -p /tmp/gobuildwarm && cd /tmp/gobuildwarm && go mod init gobuildwarm && printf "package foo\nimport (\"fmt\"\nwmill \"github.com/windmill-labs/windmill-go-client\")\nfunc main() { v := wmill.GetStatePath()\n fmt.Println(v) }" > warm.go && go mod tidy && go build -x && rm -rf /tmp/gobuildwarm +RUN mkdir -p /tmp/gobuildwarm && cd /tmp/gobuildwarm && go mod init gobuildwarm && printf "package foo\nimport (\"fmt\")\nfunc main() { fmt.Println(v) }" > warm.go && go mod tidy && go build -x && rm -rf /tmp/gobuildwarm ENV TZ=Etc/UTC diff --git a/backend/windmill-api/src/db.rs b/backend/windmill-api/src/db.rs index 1536337af7..552960cc86 100644 --- a/backend/windmill-api/src/db.rs +++ b/backend/windmill-api/src/db.rs @@ -166,6 +166,7 @@ pub async fn migrate(db: &DB) -> Result<(), Error> { tracing::error!("Database had been applied more migrations than this container. This usually mean than another container on a more recent version migrated the database and this one is on an earlier version. Please update the container to latest. Not critical, but may cause issues if migration introduced a breaking change. Version missing: {e}"); + custom_migrator.unlock().await?; Ok(()) } Err(err) => Err(err),