Merge #128630

128630: catalog/lease: fix incorrect version check for expiry based leases r=fqazi a=fqazi

Previously, with the version bump on master to 24.3, we started using the bootstrap values for 24.1. When using these values in a dev environment, the comparison between the system descriptor and the session-based leasing version can fail, since the system database descriptor doesn't have the dev versions padding. To address this, this patch removes the dev offset from the comparison.

Fixes: #128629
Release note: None

Co-authored-by: Faizan Qazi <faizan@cockroachlabs.com>

Author: craig[bot]

pkg/sql/catalog/lease/count.go

@@ -86,7 +86,8 @@ func countLeasesWithDetail(
 		systemDBVersion = &v
 	}
 	leasingDescIsSessionBased := systemDBVersion != nil &&
-		systemDBVersion.AtLeast(clusterversion.V24_1_SessionBasedLeasingUpgradeDescriptor.Version())
+		clusterversion.RemoveDevOffset(*systemDBVersion).AtLeast(
+			clusterversion.RemoveDevOffset(clusterversion.V24_1_SessionBasedLeasingUpgradeDescriptor.Version()))
 	leasingMode := readSessionBasedLeasingMode(ctx, settings)
 	whereClauses := make([][]string, 2)
 	containsSystemDatabase := false
@@ -116,13 +117,11 @@ func countLeasesWithDetail(
 		// expiry based descriptor synthetically.
 		if leasingDescIsSessionBased {
 			syntheticDescriptors = append(syntheticDescriptors, systemschema.LeaseTable_V23_2())
-			whereClauseIdx = append(whereClauseIdx, 0)
-			usesOldSchema = append(usesOldSchema, true)
 		} else {
 			syntheticDescriptors = append(syntheticDescriptors, nil)
-			whereClauseIdx = append(whereClauseIdx, 1)
-			usesOldSchema = append(usesOldSchema, false)
 		}
+		whereClauseIdx = append(whereClauseIdx, 0)
+		usesOldSchema = append(usesOldSchema, true)
 	}
 	if leasingMode >= SessionBasedDrain {
 		// The leasing descriptor is not yet session based, so inject the session