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

Merge pull request #1993 from hashicorp/b-upgrade-path 

Check for Ephemeral Disk being nil
This commit is contained in:
Alex Dadgar 2016-11-15 16:27:48 -08:00 committed by GitHub
parent c2697123a9 88c7e04348
commit 0f426d219a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/client.go
View File

@ -1393,7 +1393,7 @@ func (c *Client) runAllocs(update *allocUpdates) {
// previous allocation // previous allocation
var prevAllocDir *allocdir.AllocDir var prevAllocDir *allocdir.AllocDir
tg := add.Job.LookupTaskGroup(add.TaskGroup) tg := add.Job.LookupTaskGroup(add.TaskGroup)
if tg != nil && tg.EphemeralDisk.Sticky == true && ar != nil { if tg != nil && tg.EphemeralDisk != nil && tg.EphemeralDisk.Sticky == true && ar != nil {
prevAllocDir = ar.GetAllocDir() prevAllocDir = ar.GetAllocDir()
} }
@ -1432,7 +1432,7 @@ func (c *Client) blockForRemoteAlloc(alloc *structs.Allocation) {
} }
// Wait for the remote previous alloc to be terminal if the alloc is sticky // Wait for the remote previous alloc to be terminal if the alloc is sticky
if tg.EphemeralDisk.Sticky { if tg.EphemeralDisk != nil && tg.EphemeralDisk.Sticky {
c.logger.Printf("[DEBUG] client: blocking alloc %q for previous allocation %q", alloc.ID, alloc.PreviousAllocation) c.logger.Printf("[DEBUG] client: blocking alloc %q for previous allocation %q", alloc.ID, alloc.PreviousAllocation)
// Block until the previous allocation migrates to terminal state // Block until the previous allocation migrates to terminal state
prevAlloc, err := c.waitForAllocTerminal(alloc.PreviousAllocation) prevAlloc, err := c.waitForAllocTerminal(alloc.PreviousAllocation)
@ -1509,7 +1509,7 @@ func (c *Client) migrateRemoteAllocDir(alloc *structs.Allocation, allocID string
// Skip migration of data if the ephemeral disk is not sticky or // Skip migration of data if the ephemeral disk is not sticky or
// migration is turned off. // migration is turned off.
if !tg.EphemeralDisk.Sticky || !tg.EphemeralDisk.Migrate { if tg.EphemeralDisk == nil || !tg.EphemeralDisk.Sticky || !tg.EphemeralDisk.Migrate {
return nil, nil return nil, nil
} }