upgrade: add CREATELOGIN where a role already has CREATEROLE permanent upgrade fails #92569
Description
Describe the problem
The add CREATELOGIN where a role already has CREATEROLE permanent upgrade, introduced in #91627, fails with the following error message:
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 job 817723912734932995: running execution encountered retriable error: non-cancelable: running migration for 0.0-2: ‹add CREATELOGIN where a role already has CREATEROLE›: null value in column ‹"user_id"› violates not-null constraint
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 +(1) attached stack trace
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + -- stack trace:
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/jobs.(*Registry).stepThroughStateMachine
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/jobs/registry.go:1328
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/jobs.(*Registry).runJob
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/jobs/adopt.go:412
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/jobs.(*Registry).resumeJob.func1
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/jobs/adopt.go:332
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/util/stop.(*Stopper).RunAsyncTaskEx.func2
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/util/stop/stopper.go:470
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 +Wraps: (2) non-cancelable
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 +Wraps: (3) attached stack trace
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + -- stack trace:
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/upgrade/upgradejob.resumer.Resume
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/upgrade/upgradejob/upgrade_job.go:131
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/jobs.(*Registry).stepThroughStateMachine.func2
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/jobs/registry.go:1297
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/jobs.(*Registry).stepThroughStateMachine
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/jobs/registry.go:1298
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/jobs.(*Registry).runJob
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/jobs/adopt.go:412
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/jobs.(*Registry).resumeJob.func1
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/jobs/adopt.go:332
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/util/stop.(*Stopper).RunAsyncTaskEx.func2
I221128 07:25:01.923960 22486 jobs/registry.go:1330 ⋮ [n1] 156 + | github.com/cockroachdb/cockroach/pkg/util/stop/stopper.go:470
This is causing a few mixed-version roachtests to time out: #92230, #92371.
Jira issue: CRDB-21872