Skip to content

Fix monitor/scheduler race condition. #1186

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
baldwinn860 merged 1 commit into from
Oct 18, 2017
Merged

Fix monitor/scheduler race condition. #1186

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions test/robot/monitor/job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ func (data *Data) FindDevice(id string) *Device {

func (o *DataOwner) updateDevice(ctx context.Context, device *job.Device) error {
o.Write(func(data *Data) {
for i, e := range data.Devices.entries {
if device.Id == e.Id {
data.Devices.entries[i].Device = *device
return
}
}
data.Devices.entries = append(data.Devices.entries, &Device{Device: *device})
})
return nil
Expand Down
43 changes: 34 additions & 9 deletions test/robot/monitor/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,27 +121,52 @@ func Run(ctx context.Context, managers Managers, owner DataOwner, update func(ct
}

func monitor(ctx context.Context, managers *Managers, owner DataOwner) error {
initial := &search.Query{}
// TODO: care about monitors erroring
all := &search.Query{Monitor: true}
monitor := &search.Query{Monitor: true}
if managers.Job != nil {
crash.Go(func() { managers.Job.SearchDevices(ctx, all, owner.updateDevice) })
crash.Go(func() { managers.Job.SearchWorkers(ctx, all, owner.updateWorker) })
if err := managers.Job.SearchDevices(ctx, initial, owner.updateDevice); err != nil {
Copy link
Contributor

@ben-clayton ben-clayton Oct 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little upset that I can't find a way to refactor this into something more compact without resorting to reflection. :(

Copy link
Contributor Author

@baldwinn860 baldwinn860 Oct 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, me too, I had written like three different solutions but this was by far the most succinct, all the rest kind of exploded into lots of code changes.

return err
}
crash.Go(func() { managers.Job.SearchDevices(ctx, monitor, owner.updateDevice) })
if err := managers.Job.SearchWorkers(ctx, initial, owner.updateWorker); err != nil {
return err
}
crash.Go(func() { managers.Job.SearchWorkers(ctx, monitor, owner.updateWorker) })
}
if managers.Build != nil {
crash.Go(func() { managers.Build.SearchTracks(ctx, all, owner.updateTrack) })
crash.Go(func() { managers.Build.SearchPackages(ctx, all, owner.updatePackage) })
if err := managers.Build.SearchTracks(ctx, initial, owner.updateTrack); err != nil {
return err
}
crash.Go(func() { managers.Build.SearchTracks(ctx, monitor, owner.updateTrack) })
if err := managers.Build.SearchPackages(ctx, initial, owner.updatePackage); err != nil {
return err
}
crash.Go(func() { managers.Build.SearchPackages(ctx, monitor, owner.updatePackage) })
}
if managers.Subject != nil {
crash.Go(func() { managers.Subject.Search(ctx, all, owner.updateSubject) })
if err := managers.Subject.Search(ctx, initial, owner.updateSubject); err != nil {
return err
}
crash.Go(func() { managers.Subject.Search(ctx, monitor, owner.updateSubject) })
}
if managers.Trace != nil {
crash.Go(func() { managers.Trace.Search(ctx, all, owner.updateTrace) })
if err := managers.Trace.Search(ctx, initial, owner.updateTrace); err != nil {
return err
}
crash.Go(func() { managers.Trace.Search(ctx, monitor, owner.updateTrace) })
}
if managers.Report != nil {
crash.Go(func() { managers.Report.Search(ctx, all, owner.updateReport) })
if err := managers.Report.Search(ctx, initial, owner.updateReport); err != nil {
return err
}
crash.Go(func() { managers.Report.Search(ctx, monitor, owner.updateReport) })
}
if managers.Replay != nil {
crash.Go(func() { managers.Replay.Search(ctx, all, owner.updateReplay) })
if err := managers.Replay.Search(ctx, initial, owner.updateReplay); err != nil {
return err
}
crash.Go(func() { managers.Replay.Search(ctx, monitor, owner.updateReplay) })
}

return nil
Expand Down
3 changes: 2 additions & 1 deletion test/robot/monitor/replay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ func (r *Replays) All() []*Replay {

func (o *DataOwner) updateReplay(ctx context.Context, action *replay.Action) error {
o.Write(func(data *Data) {
data.Replays.entries = append(data.Replays.entries, &Replay{Action: *action})
entry, _ := data.Replays.FindOrCreate(ctx, action)
entry.Action = *action
})
return nil
}
Expand Down
3 changes: 2 additions & 1 deletion test/robot/monitor/report.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ func (r *Reports) All() []*Report {

func (o *DataOwner) updateReport(ctx context.Context, action *report.Action) error {
o.Write(func(data *Data) {
data.Reports.entries = append(data.Reports.entries, &Report{Action: *action})
entry, _ := data.Reports.FindOrCreate(ctx, action)
entry.Action = *action
})
return nil
}
Expand Down
5 changes: 5 additions & 0 deletions test/robot/monitor/subject.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ func (s *Subjects) All() []*Subject {

func (o *DataOwner) updateSubject(ctx context.Context, subj *subject.Subject) error {
o.Write(func(data *Data) {
for i, e := range data.Subjects.entries {
if subj.Id == e.Id {
data.Subjects.entries[i].Subject = *subj
}
}
data.Subjects.entries = append(data.Subjects.entries, &Subject{Subject: *subj})
})
return nil
Expand Down