From 163335b626fdbb0a9cb4a88df6e93ab20084c199 Mon Sep 17 00:00:00 2001
From: Robert Uhl <robert.uhl@hpe.com>
Date: Mon, 8 Apr 2024 18:09:38 -0400
Subject: [PATCH] [CORE-2246] Fix deadlock (#9937)

Backport #9934
---
 src/server/pfs/server/driver.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/server/pfs/server/driver.go b/src/server/pfs/server/driver.go
index 9317f5fc789..44c837d7ac1 100644
--- 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.