Merge pull request #154775 from stevendanna/blathers/backport-release-25.4-154743

release-25.4: server: check for isMeta1Leaseholder later in loop

Author: stevendanna

pkg/server/auto_upgrade.go

@@ -47,14 +47,6 @@ func (s *topLevelServer) startAttemptUpgrade(ctx context.Context) error {
 		}
 
 		for r := retry.StartWithCtx(ctx, retryOpts); r.Next(); {
-			if clusterversion.AutoUpgradeSystemClusterFromMeta1Leaseholder.Get(&s.ClusterSettings().SV) {
-				isMeta1LH, err := s.sqlServer.isMeta1Leaseholder(ctx, s.clock.NowAsClockTimestamp())
-				if err != nil || !isMeta1LH {
-					log.Ops.VInfof(ctx, 2, "not upgrading since we are not the Meta1 leaseholder; err=%v", err)
-					continue
-				}
-			}
-
 			clusterVersion, err := s.clusterVersion(ctx)
 			if err != nil {
 				log.Dev.Errorf(ctx, "unable to retrieve cluster version: %v", err)
@@ -94,6 +86,14 @@ func (s *topLevelServer) startAttemptUpgrade(ctx context.Context) error {
 				panic(errors.AssertionFailedf("unhandled case: %d", status))
 			}
 
+			if clusterversion.AutoUpgradeSystemClusterFromMeta1Leaseholder.Get(&s.ClusterSettings().SV) {
+				isMeta1LH, err := s.sqlServer.isMeta1Leaseholder(ctx, s.clock.NowAsClockTimestamp())
+				if err != nil || !isMeta1LH {
+					log.Ops.VInfof(ctx, 2, "not upgrading since we are not the Meta1 leaseholder; err=%v", err)
+					continue
+				}
+			}
+
 			upgradeRetryOpts := retry.Options{
 				InitialBackoff: 5 * time.Second,
 				MaxBackoff:     10 * time.Second,