Merge #136978

136978: catalog/descs: avoid log.Fatal for invalid descriptor error r=rafiss a=rafiss Rather than crashing the whole process, we can use an assertion error for this. The log.Fatal was initially added in 5d205ed, in a time far before we were careful about avoiding node crashes. fixes #136962 fixes #136961 Release note: None Co-authored-by: Rafi Shamim <[email protected]>
cockroachdb · Dec 9, 2024 · 7f75f3e · 7f75f3e
2 parents 0b43622 + bf6cbf6
commit 7f75f3e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/sql/catalog/descs/leased_descriptors.go b/pkg/sql/catalog/descs/leased_descriptors.go
@@ -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())