Skip to content

fix: make region event lookup side-effect free #2521

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

Merged
zzzhangqi merged 1 commit into from
Mar 12, 2026
Merged

fix: make region event lookup side-effect free #2521

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 1 addition & 46 deletions api/handler/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@
package handler

import (
"time"

"github.com/goodrain/rainbond/db"
dbmodel "github.com/goodrain/rainbond/db/model"
"github.com/sirupsen/logrus"
)

// ServiceEventHandler -
Expand All @@ -37,47 +34,5 @@ func NewServiceEventHandler() *ServiceEventHandler {

// ListByEventIDs -
func (s *ServiceEventHandler) ListByEventIDs(eventIDs []string) ([]*dbmodel.ServiceEvent, error) {
events, err := db.GetManager().ServiceEventDao().GetEventByEventIDs(eventIDs)
if err != nil {
return nil, err
}

// timeout events
var timeoutEvents []*dbmodel.ServiceEvent
for _, event := range events {
if !s.isTimeout(event) {
continue
}
event.Status = "timeout"
event.FinalStatus = "complete"
timeoutEvents = append(timeoutEvents, event)
}

return events, db.GetManager().ServiceEventDao().UpdateInBatch(timeoutEvents)
}

func (s *ServiceEventHandler) isTimeout(event *dbmodel.ServiceEvent) bool {
if event.FinalStatus != "" {
return false
}

startTime, err := time.ParseInLocation(time.RFC3339, event.StartTime, time.Local)
if err != nil {
logrus.Errorf("[ServiceEventHandler] [isTimeout] parse start time(%s): %v", event.StartTime, err)
return false
}

if event.OptType == "deploy" || event.OptType == "create" || event.OptType == "build" || event.OptType == "upgrade" {
end := startTime.Add(3 * time.Minute)
if time.Now().After(end) {
return true
}
} else {
end := startTime.Add(30 * time.Second)
if time.Now().After(end) {
return true
}
}

return false
return db.GetManager().ServiceEventDao().GetEventByEventIDs(eventIDs)
}
Loading