[CORE-2246] Fix deadlock (#9937)

Backport #9934
pachyderm · Apr 8, 2024 · 163335b · 163335b
1 parent babb5ee
commit 163335b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/server/pfs/server/driver.go b/src/server/pfs/server/driver.go
@@ -720,10 +720,10 @@ func (d *driver) getCompactedDiffFileSet(ctx context.Context, commit *pfs.Commit
 func (d *driver) listProject(ctx context.Context, cb func(*pfs.ProjectInfo) error) error {
 	authIsActive := true
 	return errors.Wrap(dbutil.WithTx(ctx, d.env.DB, func(ctx context.Context, tx *pachsql.Tx) error {
-		return d.txnEnv.WithWriteContext(ctx, func(txnCxt *txncontext.TransactionContext) error {
-			return d.listProjectInTransaction(ctx, txnCxt, func(proj *pfs.ProjectInfo) error {
+		return d.txnEnv.WithWriteContext(ctx, func(txnCtx *txncontext.TransactionContext) error {
+			return d.listProjectInTransaction(ctx, txnCtx, func(proj *pfs.ProjectInfo) error {
 				if authIsActive {
-					resp, err := d.env.Auth.GetPermissions(ctx, &auth.GetPermissionsRequest{Resource: proj.GetProject().AuthResource()})
+					resp, err := d.env.Auth.GetPermissionsInTransaction(txnCtx, &auth.GetPermissionsRequest{Resource: proj.GetProject().AuthResource()})
 					if err != nil {
 						if errors.Is(err, auth.ErrNotActivated) {
 							// Avoid unnecessary subsequent Auth API calls.