Skip to content

Commit

Permalink
Merge pull request #137048 from cockroachdb/blathers/backport-release…
Browse files Browse the repository at this point in the history
…-24.3-136978

release-24.3: catalog/descs: avoid log.Fatal for invalid descriptor error
  • Loading branch information
rafiss authored Dec 11, 2024
2 parents 8ea2073 + 1c35278 commit f68f5e2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/sql/catalog/descs/leased_descriptors.go
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ func (ld *leasedDescriptors) getResult(
expiration := ldesc.Expiration(ctx)
readTimestamp := txn.ReadTimestamp()
if expiration.LessEq(txn.ReadTimestamp()) {
log.Fatalf(ctx, "bad descriptor for T=%s, expiration=%s", readTimestamp, expiration)
return nil, false, errors.AssertionFailedf("bad descriptor for id=%d readTimestamp=%s, expiration=%s", ldesc.GetID(), readTimestamp, expiration)
}

ld.cache.Upsert(ldesc, ldesc.Underlying().SkipNamespace())
Expand Down

0 comments on commit f68f5e2

Please sign in to comment.