jobs: make expiration use intended txn priority

rafiss · rafiss · commit e04fb99e4df6 · 2022-08-10T18:21:41.000-04:00
In aed014f these operations were supposed to be changed to use MinUserPriority. However, they weren't using the appropriate txn, so it didn't have the intended effect. Release note: None
diff --git a/pkg/jobs/registry.go b/pkg/jobs/registry.go
@@ -729,7 +729,7 @@ func (r *Registry) Start(ctx context.Context, stopper *stop.Stopper) error {
 				return errors.WithAssertionFailure(err)
 			}
 			_, err := r.ex.ExecEx(
-				ctx, "expire-sessions", nil,
+				ctx, "expire-sessions", txn,
 				sessiondata.InternalExecutorOverride{User: username.RootUserName()},
 				removeClaimsForDeadSessionsQuery,
 				s.ID().UnsafeBytes(),
@@ -776,7 +776,7 @@ func (r *Registry) Start(ctx context.Context, stopper *stop.Stopper) error {
 				return errors.WithAssertionFailure(err)
 			}
 			_, err := r.ex.ExecEx(
-				ctx, "remove-claims-for-session", nil,
+				ctx, "remove-claims-for-session", txn,
 				sessiondata.InternalExecutorOverride{User: username.RootUserName()},
 				removeClaimsForSessionQuery, s.ID().UnsafeBytes(),
 			)

Original file line number	Diff line number	Diff line change
`@@ -729,7 +729,7 @@ func (r Registry) Start(ctx context.Context, stopper stop.Stopper) error {`
`729`	`729`	`return errors.WithAssertionFailure(err)`
`730`	`730`	`}`
`731`	`731`	`_, err := r.ex.ExecEx(`
`732`		`- ctx, "expire-sessions", nil,`
	`732`	`+ ctx, "expire-sessions", txn,`
`733`	`733`	`sessiondata.InternalExecutorOverride{User: username.RootUserName()},`
`734`	`734`	`removeClaimsForDeadSessionsQuery,`
`735`	`735`	`s.ID().UnsafeBytes(),`
`@@ -776,7 +776,7 @@ func (r Registry) Start(ctx context.Context, stopper stop.Stopper) error {`
`776`	`776`	`return errors.WithAssertionFailure(err)`
`777`	`777`	`}`
`778`	`778`	`_, err := r.ex.ExecEx(`
`779`		`- ctx, "remove-claims-for-session", nil,`
	`779`	`+ ctx, "remove-claims-for-session", txn,`
`780`	`780`	`sessiondata.InternalExecutorOverride{User: username.RootUserName()},`
`781`	`781`	`removeClaimsForSessionQuery, s.ID().UnsafeBytes(),`
`782`	`782`	`)`