Merge branch 'main' into projectparameter

kylecarbs · kylecarbs · commit c0cfac319f87 · 2022-01-29T23:39:07.000Z
diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
@@ -160,7 +160,7 @@ jobs:
         run:
           DB=true gotestsum --jsonfile="gotests.json" --packages="./..." --
           -covermode=atomic -coverprofile="gotests.coverage" -timeout=3m
-          -count=1 -race -parallel=2
+          -count=1 -race -parallel=1
 
       - uses: codecov/codecov-action@v2
         with:
diff --git a/.golangci.yml b/.golangci.yml
@@ -241,6 +241,7 @@ linters:
     - staticcheck
     - structcheck
     - tenv
+    - tparallel
     - typecheck
     - unconvert
     - unused
diff --git a/database/pubsub_memory_test.go b/database/pubsub_memory_test.go
@@ -14,6 +14,8 @@ func TestPubsubMemory(t *testing.T) {
 	t.Parallel()
 
 	t.Run("Memory", func(t *testing.T) {
+		t.Parallel()
+
 		pubsub := database.NewPubsubInMemory()
 		event := "test"
 		data := "testing"
diff --git a/database/query.sql b/database/query.sql
@@ -4,6 +4,12 @@
 -- Run "make gen" to generate models and query functions.
 ;
 
+-- Acquires the lock for a single job that isn't started, completed,
+-- cancelled, and that matches an array of provisioner types.
+--
+-- SKIP LOCKED is used to jump over locked rows. This prevents
+-- multiple provisioners from acquiring the same jobs. See:
+-- https://www.postgresql.org/docs/9.5/sql-select.html#SQL-FOR-UPDATE-SHARE
 -- name: AcquireProvisionerJob :one
 UPDATE
   provisioner_job
diff --git a/database/query.sql.go b/database/query.sql.go
