Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix(store): remove nested transaction patterns to prevent deadlock (#18914)
p0ny85f41f8be127
diff --git a/backend/store/database.go b/backend/store/database.goindex 496658e113..146ab0f226 100644--- a/backend/store/database.go+++ b/backend/store/database.go@@ -82,12 +82,6 @@ func (s *Store) GetDatabase(ctx context.Context, find *FindDatabaseMessage) (*Da}}- tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})- if err != nil {- return nil, err- }- defer tx.Rollback()-databases, err := s.ListDatabases(ctx, find)if err != nil {return nil, err@@ -100,10 +94,6 @@ func (s *Store) GetDatabase(ctx context.Context, find *FindDatabaseMessage) (*Da}database := databases[0]- if err := tx.Commit(); err != nil {- return nil, err- }-s.databaseCache.Add(getDatabaseCacheKey(database.InstanceID, database.DatabaseName), database)return database, nil}diff --git a/backend/store/database_group.go b/backend/store/database_group.goindex 021010c2f1..a585fcd6ab 100644--- a/backend/store/database_group.go+++ b/backend/store/database_group.go@@ -124,21 +124,10 @@ func (s *Store) ListDatabaseGroups(ctx context.Context, find *FindDatabaseGroupM// GetDatabaseGroup gets a database group.func (s *Store) GetDatabaseGroup(ctx context.Context, find *FindDatabaseGroupMessage) (*DatabaseGroupMessage, error) {- tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})- if err != nil {- return nil, err- }- defer tx.Rollback()-databaseGroups, err := s.ListDatabaseGroups(ctx, find)if err != nil {return nil, err}-- if err := tx.Commit(); err != nil {- return nil, errors.Wrapf(err, "failed to commit transaction")- }-if len(databaseGroups) == 0 {return nil, nil}diff --git a/backend/store/project.go b/backend/store/project.goindex c37cc9141f..c3d480accb 100644--- a/backend/store/project.go+++ b/backend/store/project.go@@ -63,12 +63,6 @@ func (s *Store) GetProject(ctx context.Context, find *FindProjectMessage) (*Proj// We will always return the resource regardless of its deleted state.find.ShowDeleted = true- tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})- if err != nil {- return nil, err- }- defer tx.Rollback()-projects, err := s.ListProjects(ctx, find)if err != nil {return nil, err@@ -81,12 +75,8 @@ func (s *Store) GetProject(ctx context.Context, find *FindProjectMessage) (*Proj}project := projects[0]- if err := tx.Commit(); err != nil {- return nil, err- }-s.storeProjectCache(project)- return projects[0], nil+ return project, nil}// ListProjects lists all projects.@@ -158,6 +148,11 @@ func (s *Store) ListProjects(ctx context.Context, find *FindProjectMessage) ([]*return nil, err}+ if err := tx.Commit(); err != nil {+ return nil, err+ }++ // Fetch webhooks outside the transaction to prevent deadlock when connection pool is exhausted.for _, project := range projectMessages {projectWebhooks, err := s.ListProjectWebhooks(ctx, &FindProjectWebhookMessage{ProjectID: &project.ResourceID})if err != nil {@@ -166,10 +161,6 @@ func (s *Store) ListProjects(ctx context.Context, find *FindProjectMessage) ([]*project.Webhooks = projectWebhooks}- if err := tx.Commit(); err != nil {- return nil, err- }-for _, project := range projectMessages {s.storeProjectCache(project)}diff --git a/backend/store/project_webhook.go b/backend/store/project_webhook.goindex 4e89dc60c5..55d6da463c 100644--- a/backend/store/project_webhook.go+++ b/backend/store/project_webhook.go@@ -171,27 +171,16 @@ func (s *Store) ListProjectWebhooks(ctx context.Context, find *FindProjectWebhoo// GetProjectWebhook gets an instance of ProjectWebhook.func (s *Store) GetProjectWebhook(ctx context.Context, find *FindProjectWebhookMessage) (*ProjectWebhookMessage, error) {- tx, err := s.GetDB().BeginTx(ctx, &sql.TxOptions{ReadOnly: true})- if err != nil {- return nil, errors.Wrapf(err, "failed to begin transaction")- }-webhooks, err := s.ListProjectWebhooks(ctx, find)if err != nil {return nil, err}-- if err := tx.Commit(); err != nil {- return nil, errors.Wrapf(err, "failed to commit transaction")- }-if len(webhooks) == 0 {return nil, nil}if len(webhooks) > 1 {return nil, errors.Errorf("expected find one project webhook wit %+v, but found %d", find, len(webhooks))}-return webhooks[0], nil}