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

Jump to bottom

scheduler: bugfix for slow-trend-scheduler when timestamp of heartbeats are equal #6273

Merged
merged 12 commits into from
Apr 13, 2023
Merged

scheduler: bugfix for slow-trend-scheduler when timestamp of heartbeats are equal #6273

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ee689ee
Add annoatations for bugfix waited to be done in next works.
LykxSassinator Apr 6, 2023
3c1718a
Bugfix for checking the update of stores.
LykxSassinator Apr 11, 2023
cd879f9
Revoke unnecessary annotations.
LykxSassinator Apr 12, 2023
7c0fa6c
Merge branch 'master' into bugfix_detect_slowness
LykxSassinator Apr 12, 2023
227e7fb
Polish logs.
LykxSassinator Apr 12, 2023
9844063
Merge branch 'master' into bugfix_detect_slowness
LykxSassinator Apr 13, 2023
260a805
Polish codes.
LykxSassinator Apr 13, 2023
f6a4a3c
Merge branch 'master' into bugfix_detect_slowness
LykxSassinator Apr 13, 2023
ad1a69d
Merge branch 'master' into bugfix_detect_slowness
ti-chi-bot Apr 13, 2023
fb1b064
Merge branch 'master' into bugfix_detect_slowness
ti-chi-bot Apr 13, 2023
aa9133c
Merge branch 'master' into bugfix_detect_slowness
ti-chi-bot Apr 13, 2023
b2b6337
Merge branch 'master' into bugfix_detect_slowness
ti-chi-bot Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 10 additions & 6 deletions pkg/schedule/schedulers/evict_slow_trend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ func (conf *evictSlowTrendSchedulerConfig) candidate() uint64 {
return conf.evictCandidate
}

func (conf *evictSlowTrendSchedulerConfig) captureTS() time.Time {
return conf.candidateCaptureTime
}

func (conf *evictSlowTrendSchedulerConfig) candidateCapturedSecs() uint64 {
return uint64(time.Since(conf.candidateCaptureTime).Seconds())
}
Expand Down Expand Up @@ -237,7 +241,8 @@ func (s *evictSlowTrendScheduler) Schedule(cluster schedule.Cluster, dryRun bool
storeSlowTrendActionStatusGauge.WithLabelValues("cand.cancel:too-faster").Inc()
return ops, nil
}
if !checkStoresAreUpdated(cluster, slowStore) {
slowStoreRecordTS := s.conf.captureTS()
if !checkStoresAreUpdated(cluster, slowStoreID, slowStoreRecordTS) {
log.Info("slow store candidate waiting for other stores to update heartbeats",
zap.Uint64("store-id", slowStoreID))
storeSlowTrendActionStatusGauge.WithLabelValues("cand.wait").Inc()
Expand Down Expand Up @@ -322,18 +327,17 @@ func chooseEvictCandidate(cluster schedule.Cluster) (slowStore *core.StoreInfo)
}

storeSlowTrendActionStatusGauge.WithLabelValues("cand.add").Inc()
log.Info("evict-slow-trend-scheduler canptured candidate", zap.Uint64("store-id", store.GetID()))
log.Info("evict-slow-trend-scheduler captured candidate", zap.Uint64("store-id", store.GetID()))
return store
}

func checkStoresAreUpdated(cluster schedule.Cluster, baseline *core.StoreInfo) bool {
func checkStoresAreUpdated(cluster schedule.Cluster, slowStoreID uint64, slowStoreRecordTS time.Time) bool {
stores := cluster.GetStores()
if len(stores) <= 1 {
return false
}
expected := (len(stores) + 1) / 2
updatedStores := 0
baselineTS := baseline.GetLastHeartbeatTS()
for _, store := range stores {
if store.IsRemoved() {
updatedStores += 1
Expand All @@ -343,11 +347,11 @@ func checkStoresAreUpdated(cluster schedule.Cluster, baseline *core.StoreInfo) b
updatedStores += 1
continue
}
if store.GetID() == baseline.GetID() {
if store.GetID() == slowStoreID {
updatedStores += 1
continue
}
if baselineTS.Before(store.GetLastHeartbeatTS()) {
if slowStoreRecordTS.Before(store.GetLastHeartbeatTS()) {
updatedStores += 1
}
}
Expand Down