WIP: debug test failure

authzed · Dec 10, 2024 · 62c8697 · 62c8697
1 parent d5c323b
commit 62c8697
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/internal/datastore/postgres/locks.go b/internal/datastore/postgres/locks.go
@@ -1,6 +1,8 @@
 package postgres
 
-import "context"
+import (
+	"context"
+)
 
 type lockID uint32
 
@@ -19,6 +21,7 @@ func (pgd *pgDatastore) tryAcquireLock(ctx context.Context, lockID lockID) (bool
 	if err := row.Scan(&lockAcquired); err != nil {
 		return false, err
 	}
+
 	return lockAcquired, nil
 }
 

diff --git a/internal/datastore/postgres/postgres_shared_test.go b/internal/datastore/postgres/postgres_shared_test.go
@@ -109,12 +109,12 @@ func testPostgresDatastore(t *testing.T, pc []postgresConfig) {
 			b := testdatastore.RunPostgresForTesting(t, "", config.targetMigration, config.pgVersion, config.pgbouncer)
 			ctx := context.Background()
 
-			test.AllWithExceptions(t, test.DatastoreTesterFunc(func(revisionQuantization, gcInterval, gcWindow time.Duration, watchBufferLength uint16) (datastore.Datastore, error) {
+			test.AllWithExceptions(t, test.DatastoreTesterFunc(func(revisionQuantization, _, gcWindow time.Duration, watchBufferLength uint16) (datastore.Datastore, error) {
 				ds := b.NewDatastore(t, func(engine, uri string) datastore.Datastore {
 					ds, err := newPostgresDatastore(ctx, uri, primaryInstanceID,
 						RevisionQuantization(revisionQuantization),
 						GCWindow(gcWindow),
-						GCInterval(gcInterval),
+						GCInterval(veryLargeGCInterval),
 						WatchBufferLength(watchBufferLength),
 						DebugAnalyzeBeforeStatistics(),
 						MigrationPhase(config.migrationPhase),
@@ -153,7 +153,7 @@ func testPostgresDatastore(t *testing.T, pc []postgresConfig) {
 					RevisionInversionTest,
 					RevisionQuantization(0),
 					GCWindow(1*time.Millisecond),
-					GCInterval(1*time.Hour),
+					GCInterval(veryLargeGCInterval),
 					WatchBufferLength(1),
 					MigrationPhase(config.migrationPhase),
 				))
@@ -163,7 +163,7 @@ func testPostgresDatastore(t *testing.T, pc []postgresConfig) {
 					ConcurrentRevisionHeadTest,
 					RevisionQuantization(0),
 					GCWindow(1*time.Millisecond),
-					GCInterval(1*time.Hour),
+					GCInterval(veryLargeGCInterval),
 					WatchBufferLength(1),
 					MigrationPhase(config.migrationPhase),
 				))
@@ -173,7 +173,7 @@ func testPostgresDatastore(t *testing.T, pc []postgresConfig) {
 					ConcurrentRevisionWatchTest,
 					RevisionQuantization(0),
 					GCWindow(1*time.Millisecond),
-					GCInterval(1*time.Hour),
+					GCInterval(veryLargeGCInterval),
 					WatchBufferLength(50),
 					MigrationPhase(config.migrationPhase),
 				))
@@ -183,7 +183,7 @@ func testPostgresDatastore(t *testing.T, pc []postgresConfig) {
 					OverlappingRevisionWatchTest,
 					RevisionQuantization(0),
 					GCWindow(1*time.Millisecond),
-					GCInterval(1*time.Hour),
+					GCInterval(veryLargeGCInterval),
 					WatchBufferLength(50),
 					MigrationPhase(config.migrationPhase),
 				))
@@ -193,7 +193,7 @@ func testPostgresDatastore(t *testing.T, pc []postgresConfig) {
 					RepairTransactionsTest,
 					RevisionQuantization(0),
 					GCWindow(1*time.Millisecond),
-					GCInterval(1*time.Hour),
+					GCInterval(veryLargeGCInterval),
 					WatchBufferLength(1),
 					MigrationPhase(config.migrationPhase),
 				))
@@ -203,7 +203,7 @@ func testPostgresDatastore(t *testing.T, pc []postgresConfig) {
 					NullCaveatWatchTest,
 					RevisionQuantization(0),
 					GCWindow(1*time.Millisecond),
-					GCInterval(1*time.Hour),
+					GCInterval(veryLargeGCInterval),
 					WatchBufferLength(50),
 					MigrationPhase(config.migrationPhase),
 				))
@@ -213,7 +213,7 @@ func testPostgresDatastore(t *testing.T, pc []postgresConfig) {
 					RevisionTimestampAndTransactionIDTest,
 					RevisionQuantization(0),
 					GCWindow(1*time.Millisecond),
-					GCInterval(1*time.Hour),
+					GCInterval(veryLargeGCInterval),
 					WatchBufferLength(50),
 					MigrationPhase(config.migrationPhase),
 				))
@@ -223,7 +223,7 @@ func testPostgresDatastore(t *testing.T, pc []postgresConfig) {
 					CheckpointsOnOutOfBandChangesTest,
 					RevisionQuantization(0),
 					GCWindow(1*time.Millisecond),
-					GCInterval(1*time.Hour),
+					GCInterval(veryLargeGCInterval),
 					WatchBufferLength(50),
 					MigrationPhase(config.migrationPhase),
 				))
@@ -233,7 +233,7 @@ func testPostgresDatastore(t *testing.T, pc []postgresConfig) {
 					SerializationErrorTest,
 					RevisionQuantization(0),
 					GCWindow(1*time.Millisecond),
-					GCInterval(1*time.Hour),
+					GCInterval(veryLargeGCInterval),
 					WatchBufferLength(50),
 					MigrationPhase(config.migrationPhase),
 				))
@@ -243,7 +243,7 @@ func testPostgresDatastore(t *testing.T, pc []postgresConfig) {
 					StrictReadModeTest,
 					RevisionQuantization(0),
 					GCWindow(1000*time.Second),
-					GCInterval(1*time.Hour),
+					GCInterval(veryLargeGCInterval),
 					WatchBufferLength(50),
 					MigrationPhase(config.migrationPhase),
 					ReadStrictMode(true),
@@ -254,7 +254,7 @@ func testPostgresDatastore(t *testing.T, pc []postgresConfig) {
 					LockingTest,
 					RevisionQuantization(0),
 					GCWindow(1000*time.Second),
-					GCInterval(1*time.Hour),
+					GCInterval(veryLargeGCInterval),
 					WatchBufferLength(50),
 					MigrationPhase(config.migrationPhase),
 				))
@@ -265,7 +265,7 @@ func testPostgresDatastore(t *testing.T, pc []postgresConfig) {
 				OTelTracingTest,
 				RevisionQuantization(0),
 				GCWindow(1*time.Millisecond),
-				GCInterval(1*time.Hour),
+				GCInterval(veryLargeGCInterval),
 				WatchBufferLength(1),
 				MigrationPhase(config.migrationPhase),
 			))
@@ -285,12 +285,12 @@ func testPostgresDatastoreWithoutCommitTimestamps(t *testing.T, pc []postgresCon
 
 			// NOTE: watch API requires the commit timestamps, so we skip those tests here.
 			// NOTE: gc tests take exclusive locks, so they are run under non-parallel.
-			test.AllWithExceptions(t, test.DatastoreTesterFunc(func(revisionQuantization, gcInterval, gcWindow time.Duration, watchBufferLength uint16) (datastore.Datastore, error) {
+			test.AllWithExceptions(t, test.DatastoreTesterFunc(func(revisionQuantization, _, gcWindow time.Duration, watchBufferLength uint16) (datastore.Datastore, error) {
 				ds := b.NewDatastore(t, func(engine, uri string) datastore.Datastore {
 					ds, err := newPostgresDatastore(ctx, uri, primaryInstanceID,
 						RevisionQuantization(revisionQuantization),
 						GCWindow(gcWindow),
-						GCInterval(gcInterval),
+						GCInterval(veryLargeGCInterval),
 						WatchBufferLength(watchBufferLength),
 						DebugAnalyzeBeforeStatistics(),
 					)

diff --git a/pkg/datastore/test/revisions.go b/pkg/datastore/test/revisions.go
@@ -131,7 +131,7 @@ func RevisionGCTest(t *testing.T, tester DatastoreTester) {
 	gcable, ok := ds.(common.GarbageCollector)
 	if ok {
 		gcable.ResetGCCompleted()
-		require.Eventually(func() bool { return gcable.HasGCRun() }, 10*time.Second, 100*time.Millisecond, "GC was never run as expected")
+		require.Eventually(func() bool { return gcable.HasGCRun() }, 5*time.Second, 50*time.Millisecond, "GC was never run as expected")
 	}
 
 	// FIXME currently the various datastores behave differently when a revision was requested and GC Window elapses.