Skip to content

Commit

Permalink
fix keeper bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
Wenne committed Dec 6, 2023
1 parent 92a6922 commit e41753c
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions keeper/mysql/mysql.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,22 @@ func (k *Keeper) Close() {
close(k.closeCh)
k.wg.Wait()

if k.leaderFlag.Load().(bool) {
err := k.transaction(func(tx *gorm.DB) error {
return tx.Delete(&Election{}, "id = ?", LeaderKey).Error
})
if err != nil {
log.Errorf("deregister leader failed: %s", err)
}
}

err := k.transaction(func(tx *gorm.DB) error {
return tx.Delete(&Heartbeat{}, "worker_key = ?", k.WorkerKey()).Error
})
if err != nil {
log.Errorf("deregister heart beat failed: %s", err)
}

sqlDB, err := k.gormDB.DB()
if err != nil {
log.Errorf("get store client failed: %s", err)
Expand Down Expand Up @@ -229,14 +245,12 @@ func (k *Keeper) goElect() {

func (k *Keeper) elect() {
if k.leaderFlag.Load().(bool) {
log.Info("yyyyyyyyyyyyyyyyyyyyyyyy")
if err := k.continueLeader(); err != nil {
log.Errorf("continue leader failed: %s", err)
k.setLeaderFlag(false)
return
}
} else {
log.Info("xxxxxxxxxxxxxxxxxxxxxxxx")
if err := k.campaign(); err != nil {
log.Errorf("campaign failed: %s", err)
return
Expand Down

0 comments on commit e41753c

Please sign in to comment.