Merge pull request #1655 from josephschorr/postgres-gc-test-window

Fix flaky Postgres GC tests
authzed · Jan 30, 2024 · 04c7255 · 04c7255
2 parents 395f2c9 + 450b1f7
commit 04c7255
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 30 deletions.
diff --git a/internal/datastore/postgres/postgres_shared_test.go b/internal/datastore/postgres/postgres_shared_test.go
@@ -102,16 +102,6 @@ func testPostgresDatastore(t *testing.T, pc []postgresConfig) {
 				return ds, nil
 			}))
 
-			t.Run("GarbageCollection", createDatastoreTest(
-				b,
-				GarbageCollectionTest,
-				RevisionQuantization(0),
-				GCWindow(1*time.Millisecond),
-				GCInterval(veryLargeGCInterval),
-				WatchBufferLength(1),
-				MigrationPhase(config.migrationPhase),
-			))
-
 			t.Run("TransactionTimestamps", createDatastoreTest(
 				b,
 				TransactionTimestampsTest,
@@ -122,26 +112,6 @@ func testPostgresDatastore(t *testing.T, pc []postgresConfig) {
 				MigrationPhase(config.migrationPhase),
 			))
 
-			t.Run("GarbageCollectionByTime", createDatastoreTest(
-				b,
-				GarbageCollectionByTimeTest,
-				RevisionQuantization(0),
-				GCWindow(1*time.Millisecond),
-				GCInterval(veryLargeGCInterval),
-				WatchBufferLength(1),
-				MigrationPhase(config.migrationPhase),
-			))
-
-			t.Run("ChunkedGarbageCollection", createDatastoreTest(
-				b,
-				ChunkedGarbageCollectionTest,
-				RevisionQuantization(0),
-				GCWindow(1*time.Millisecond),
-				GCInterval(veryLargeGCInterval),
-				WatchBufferLength(1),
-				MigrationPhase(config.migrationPhase),
-			))
-
 			t.Run("QuantizedRevisions", func(t *testing.T) {
 				QuantizedRevisionTest(t, b)
 			})

diff --git a/internal/datastore/postgres/postgres_test.go b/internal/datastore/postgres/postgres_test.go
@@ -4,7 +4,11 @@
 package postgres
 
 import (
+	"fmt"
 	"testing"
+	"time"
+
+	testdatastore "github.com/authzed/spicedb/internal/testserver/datastore"
 )
 
 func TestPostgresDatastore(t *testing.T) {
@@ -18,3 +22,47 @@ func TestPostgresDatastoreWithoutCommitTimestamps(t *testing.T) {
 
 	testPostgresDatastoreWithoutCommitTimestamps(t, postgresConfigs)
 }
+
+func TestPostgresDatastoreGC(t *testing.T) {
+	for _, config := range postgresConfigs {
+		pgbouncerStr := ""
+		if config.pgbouncer {
+			pgbouncerStr = "pgbouncer-"
+		}
+		t.Run(fmt.Sprintf("%spostgres-gc-%s-%s-%s", pgbouncerStr, config.pgVersion, config.targetMigration, config.migrationPhase), func(t *testing.T) {
+			t.Parallel()
+
+			b := testdatastore.RunPostgresForTesting(t, "", config.targetMigration, config.pgVersion, config.pgbouncer)
+
+			t.Run("GarbageCollection", createDatastoreTest(
+				b,
+				GarbageCollectionTest,
+				RevisionQuantization(0),
+				GCWindow(1*time.Millisecond),
+				GCInterval(veryLargeGCInterval),
+				WatchBufferLength(1),
+				MigrationPhase(config.migrationPhase),
+			))
+
+			t.Run("GarbageCollectionByTime", createDatastoreTest(
+				b,
+				GarbageCollectionByTimeTest,
+				RevisionQuantization(0),
+				GCWindow(1*time.Millisecond),
+				GCInterval(veryLargeGCInterval),
+				WatchBufferLength(1),
+				MigrationPhase(config.migrationPhase),
+			))
+
+			t.Run("ChunkedGarbageCollection", createDatastoreTest(
+				b,
+				ChunkedGarbageCollectionTest,
+				RevisionQuantization(0),
+				GCWindow(1*time.Millisecond),
+				GCInterval(veryLargeGCInterval),
+				WatchBufferLength(1),
+				MigrationPhase(config.migrationPhase),
+			))
+		})
+	}
+}