tso: fix an invalid err != nil check (#8523)

[ti-chi-bot]

This is an automated cherry-pick of #8523

What problem does this PR solve?

Issue Number: close #8524.

pd/pkg/tso/keyspace_group_manager.go

Lines 1365 to 1384 in 1c1cd99

	var mergedTS time.Time
	for _, id := range mergeList {
	ts, err := kgm.tsoSvcStorage.LoadTimestamp(endpoint.KeyspaceGroupGlobalTSPath(id))
	if err != nil {
	log.Error("failed to load the keyspace group TSO",
	zap.String("member", kgm.tsoServiceID.ServiceAddr),
	zap.Uint32("merge-target-id", mergeTargetID),
	zap.Any("merge-list", mergeList),
	zap.Uint32("merge-id", id),
	zap.Time("ts", ts),
	zap.Error(err))
	break
	}
	if ts.After(mergedTS) {
	mergedTS = ts
	}
	}
	if err != nil {
	continue
	}

Since the err in the loop is a local variable, so the check at line 1382 will always be false before this fix.

What is changed and how does it work?

Use the continue label to retry the whole merge loop correctly.

Check List

Tests

• Unit test
• Integration test

Release note

None.

[codecov]

Codecov Report

Attention: Patch coverage is 50.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 77.41%. Comparing base (1c1cd99) to head (4840dd5).

Additional details and impacted files

@@             Coverage Diff              @@
##           release-8.3    #8527   +/-   ##
============================================
  Coverage        77.40%   77.41%           
============================================
  Files              473      473           
  Lines            61934    61933    -1     
============================================
+ Hits             47941    47943    +2     
- Misses           10409    10416    +7     
+ Partials          3584     3574   -10     

Flag	Coverage Δ
unittests	77.41% <50.00%> (+<0.01%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

[ti-chi-bot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: HuSharp, JmPotato

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [HuSharp,JmPotato]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment