fix: can't recover after a upgrade failed #120
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -66,38 +66,31 @@ func (pu *pdUpgrader) gracefulUpgrade(tc *v1alpha1.TidbCluster, oldSet *apps.Sta | |
| } | ||
|
|
||
| tc.Status.PD.Phase = v1alpha1.UpgradePhase | ||
| if !templateEqual(newSet.Spec.Template, oldSet.Spec.Template) { | ||
| return nil | ||
| } | ||
|
|
||
| setUpgradePartition(newSet, *oldSet.Spec.UpdateStrategy.RollingUpdate.Partition) | ||
|
There was a problem hiding this comment. This line should be added to the |
||
| for i := tc.Status.PD.StatefulSet.Replicas - 1; i >= 0; i-- { | ||
| podName := pdPodName(tcName, i) | ||
| pod, err := pu.podLister.Pods(ns).Get(podName) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| revision, exist := pod.Labels[apps.ControllerRevisionHashLabelKey] | ||
| if !exist { | ||
| return controller.RequeueErrorf("tidbcluster: [%s/%s]'s pd pod: [%s] have not label: %s", ns, tcName, podName, apps.ControllerRevisionHashLabelKey) | ||
|
|
||
| } | ||
|
|
||
| if revision == tc.Status.PD.StatefulSet.UpdateRevision { | ||
| if member, exist := tc.Status.PD.Members[podName]; !exist || !member.Health { | ||
| return controller.RequeueErrorf("tidbcluster: [%s/%s]'s pd upgraded pod: [%s] are not ready", ns, tcName, podName) | ||
| } | ||
| continue | ||
| } | ||
|
|
||
| return pu.upgradePDPod(tc, i, newSet) | ||
| } | ||
|
|
||
| return nil | ||
|
|
@@ -131,6 +124,53 @@ func (pu *pdUpgrader) needForceUpgrade(tc *v1alpha1.TidbCluster) (bool, error) { | |
| return imagePullFailedCount >= int(tc.Status.PD.StatefulSet.Replicas)/2+1, nil | ||
| } | ||
|
|
||
| func (pu *pdUpgrader) upgradePDPod(tc *v1alpha1.TidbCluster, ordinal int32, newSet *apps.StatefulSet) error { | ||
| ns := tc.GetNamespace() | ||
| tcName := tc.GetName() | ||
| upgradePodName := pdPodName(tcName, ordinal) | ||
| if tc.Status.PD.Leader.Name == upgradePodName { | ||
| lastOrdinal := tc.Status.PD.StatefulSet.Replicas - 1 | ||
| var targetName string | ||
| if ordinal == lastOrdinal { | ||
| targetName = pdPodName(tcName, 0) | ||
| } else { | ||
| targetName = pdPodName(tcName, lastOrdinal) | ||
| } | ||
| err := pu.transferPDLeaderTo(tc, targetName) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return controller.RequeueErrorf("tidbcluster: [%s/%s]'s pd member: [%s] is transferring leader to pd member: [%s]", ns, tcName, upgradePodName, targetName) | ||
| } | ||
|
|
||
| setUpgradePartition(newSet, ordinal) | ||
| return nil | ||
| } | ||
|
|
||
| func (pu *pdUpgrader) pdStatefulSetIsUpgrading(set *apps.StatefulSet, tc *v1alpha1.TidbCluster) (bool, error) { | ||
|
There was a problem hiding this comment. This method is unused and duplicated with the method in |
||
| if statefulSetIsUpgrading(set) { | ||
| return true, nil | ||
| } | ||
| selector, err := label.New().Cluster(tc.GetName()).PD().Selector() | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
| pdPods, err := pu.podLister.Pods(tc.GetNamespace()).List(selector) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
| for _, pod := range pdPods { | ||
| revisionHash, exist := pod.Labels[apps.ControllerRevisionHashLabelKey] | ||
| if !exist { | ||
| return false, nil | ||
| } | ||
| if revisionHash != tc.Status.PD.StatefulSet.UpdateRevision { | ||
| return true, nil | ||
| } | ||
| } | ||
| return false, nil | ||
| } | ||
|
|
||
| func (pu *pdUpgrader) transferPDLeaderTo(tc *v1alpha1.TidbCluster, targetName string) error { | ||
| return pu.pdControl.GetPDClient(tc).TransferPDLeader(targetName) | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Set
Partitionto the maxThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And add a comment to indicate the reason why
return nil.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the Partition default is max