Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix auto scaler status syncing error #2289

Merged
merged 2 commits into from
Apr 26, 2020
Merged

Fix auto scaler status syncing error #2289

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7cf2c5
Update autoscaler_manager.go
Apr 24, 2020
98331ab
Merge branch 'master' into fix_ta_status_error
Yisaer Apr 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pkg/autoscaler/autoscaler/autoscaler_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@ func (am *autoScalerManager) updateAutoScaling(oldTc *v1alpha1.TidbCluster,
}

if tac.Spec.TiKV != nil {
tac.Status.TiKV.CurrentReplicas = oldTc.Status.TiKV.StatefulSet.CurrentReplicas
if oldTc.Status.TiKV.StatefulSet != nil {
tac.Status.TiKV.CurrentReplicas = oldTc.Status.TiKV.StatefulSet.CurrentReplicas
}
lastTimestamp, err := f(label.AnnTiKVLastAutoScalingTimestamp)
if err != nil {
return err
Expand All @@ -160,7 +162,9 @@ func (am *autoScalerManager) updateAutoScaling(oldTc *v1alpha1.TidbCluster,
tac.Status.TiKV = nil
}
if tac.Spec.TiDB != nil {
tac.Status.TiDB.CurrentReplicas = oldTc.Status.TiDB.StatefulSet.CurrentReplicas
if oldTc.Status.TiDB.StatefulSet != nil {
tac.Status.TiDB.CurrentReplicas = oldTc.Status.TiDB.StatefulSet.CurrentReplicas
}
lastTimestamp, err := f(label.AnnTiDBLastAutoScalingTimestamp)
if err != nil {
return err
Expand Down