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.

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 race enabling tasks on startup #95

Merged
merged 1 commit into from
Dec 15, 2015
Merged
Changes from all commits
Commits
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
33 changes: 21 additions & 12 deletions services/task_store/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,31 +142,40 @@ func (ts *Service) Open() error {
}

// Start enabled tasks
enabledTasks := make([]string, 0)
err = ts.db.View(func(tx *bolt.Tx) error {
b := tx.Bucket([]byte(enabledBucket))
if b == nil {
return nil
}
return b.ForEach(func(k, v []byte) error {
ts.logger.Println("D! enabling task on startup", string(k))
t, err := ts.Load(string(k))
if err != nil {
ts.logger.Printf("E! error loading enabled task %s, err: %s\n", string(k), err)
return nil
}
err = ts.StartTask(t)
if err != nil {
ts.logger.Printf("E! error starting enabled task %s, err: %s\n", string(k), err)
} else {
numEnabledTasks++
}
enabledTasks = append(enabledTasks, string(k))
return nil
})
})
if err != nil {
return err
}

// Start each enabled task
for _, name := range enabledTasks {
ts.logger.Println("D! enabling task on startup", name)
t, err := ts.Load(name)
ts.logger.Println("D! loaded", name)
if err != nil {
ts.logger.Printf("E! error loading enabled task %s, err: %s\n", name, err)
return nil
}
err = ts.StartTask(t)
ts.logger.Println("D! started", name)
if err != nil {
ts.logger.Printf("E! error starting enabled task %s, err: %s\n", name, err)
} else {
numEnabledTasks++
}
ts.logger.Println("D! enabled task on startup", name)
}

// Set expvars
kapacitor.NumTasks.Set(numTasks)
kapacitor.NumEnabledTasks.Set(numEnabledTasks)
Expand Down