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

Template emits events explaining why it is blocked #3001

Merged
merged 4 commits into from
Aug 10, 2017
Merged

Template emits events explaining why it is blocked #3001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43d2c42
Emit generic task events
dadgar Aug 8, 2017
6c0bb2b
Vendor new consul-template
dadgar Aug 9, 2017
1e7ae91
Template emits events explaining why it is blocked
dadgar Aug 10, 2017
9cc5e19
address comments
dadgar Aug 10, 2017
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
2 changes: 2 additions & 0 deletions api/tasks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,7 @@ const (
TaskRestartSignal = "Restart Signaled"
TaskLeaderDead = "Leader Task Dead"
TaskBuildingTaskDir = "Building Task Directory"
TaskGenericMessage = "Generic"
)

// TaskEvent is an event that effects the state of a task and contains meta-data
Expand Down Expand Up @@ -533,4 +534,5 @@ type TaskEvent struct {
VaultError string
TaskSignalReason string
TaskSignal string
GenericSource string
}
17 changes: 13 additions & 4 deletions client/alloc_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,9 +620,10 @@ func (r *AllocRunner) setStatus(status, desc string) {
}
}

// setTaskState is used to set the status of a task. If state is empty then the
// event is appended but not synced with the server. The event may be omitted
func (r *AllocRunner) setTaskState(taskName, state string, event *structs.TaskEvent) {
// setTaskState is used to set the status of a task. If lazySync is set then the
// event is appended but not synced with the server. If state is omitted, the
// last known state is used.
func (r *AllocRunner) setTaskState(taskName, state string, event *structs.TaskEvent, lazySync bool) {
r.taskStatusLock.Lock()
defer r.taskStatusLock.Unlock()
taskState, ok := r.taskStates[taskName]
Expand All @@ -643,10 +644,18 @@ func (r *AllocRunner) setTaskState(taskName, state string, event *structs.TaskEv
r.appendTaskEvent(taskState, event)
}

if state == "" {
if lazySync {
Copy link
Member

Choose a reason for hiding this comment

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

Why do we need a new flag for this? Can't we skip sync'ing if new state == old state (meaning just a local event has occurred)?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No because we want to push the events. The lazy sync is useful when the event will be immediately followed up so that you can avoid a networked sync.

return
}

// If the state hasn't been set use the existing state.
if state == "" {
state = taskState.State
if taskState.State == "" {
state = structs.TaskStatePending
}
}

switch state {
case structs.TaskStateRunning:
// Capture the start time if it is just starting
Expand Down