luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #2857 from hashicorp/b-retry-send 

Use broadcast send retry logic everywhere
This commit is contained in:
Michael Schurter 2017-07-18 14:39:04 -07:00 committed by GitHub
parent d2381c9263 c1b8bef813
commit 7f53c951c2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/alloc_runner.go
View File

@ -576,7 +576,12 @@ func (r *AllocRunner) syncStatus() error {
// Get a copy of our alloc, update status server side and sync to disk // Get a copy of our alloc, update status server side and sync to disk
alloc := r.Alloc() alloc := r.Alloc()
r.updater(alloc) r.updater(alloc)
r.sendBroadcast(alloc)
return r.saveAllocRunnerState()
}
// sendBroadcast broadcasts an alloc update.
func (r *AllocRunner) sendBroadcast(alloc *structs.Allocation) {
// Try to send the alloc up to three times with a delay to allow recovery. // Try to send the alloc up to three times with a delay to allow recovery.
sent := false sent := false
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
@ -588,8 +593,6 @@ func (r *AllocRunner) syncStatus() error {
if !sent { if !sent {
r.logger.Printf("[WARN] client: failed to broadcast update to allocation %q", r.allocID) r.logger.Printf("[WARN] client: failed to broadcast update to allocation %q", r.allocID)
} }
return r.saveAllocRunnerState()
} }
// setStatus is used to update the allocation status // setStatus is used to update the allocation status
@ -876,7 +879,7 @@ func (r *AllocRunner) handleDestroy() {
go r.updater(alloc) go r.updater(alloc)
// Broadcast and persist state synchronously // Broadcast and persist state synchronously
r.allocBroadcast.Send(alloc) r.sendBroadcast(alloc)
if err := r.saveAllocRunnerState(); err != nil { if err := r.saveAllocRunnerState(); err != nil {
r.logger.Printf("[WARN] client: alloc %q unable to persist state but should be GC'd soon anyway:%v", r.logger.Printf("[WARN] client: alloc %q unable to persist state but should be GC'd soon anyway:%v",
r.allocID, err) r.allocID, err)