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

Merge pull request #1879 from hashicorp/b-remote-alloc

Browse source 
Not blocking for remote alloc if the alloc is not sticky
This commit is contained in:
Diptanu Choudhury 2016-10-27 15:45:44 -07:00 committed by GitHub
parent 5ddf646615 3182d0454f
commit 0d7a16bc92
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
client/client.go
View file

@ -1393,8 +1393,6 @@ func (c *Client) runAllocs(update *allocUpdates) {
// blockForRemoteAlloc blocks until the previous allocation of an allocation has
// been terminated and migrates the snapshot data
func (c *Client) blockForRemoteAlloc(alloc *structs.Allocation) {
c.logger.Printf("[DEBUG] client: blocking alloc %q for previous allocation %q", alloc.ID, alloc.PreviousAllocation)
// Removing the allocation from the set of allocs which are currently
// undergoing migration
defer func() {
@ -1403,18 +1401,36 @@ func (c *Client) blockForRemoteAlloc(alloc *structs.Allocation) {
c.migratingAllocsLock.Unlock()
}()
// Block until the previous allocation migrates to terminal state
prevAlloc, err := c.waitForAllocTerminal(alloc.PreviousAllocation)
if err != nil {
c.logger.Printf("[ERR] client: error waiting for allocation %q: %v", alloc.PreviousAllocation, err)
// prevAllocDir is the allocation directory of the previous allocation
var prevAllocDir *allocdir.AllocDir
// If the allocation is not sticky then we won't wait for the previous
// allocation to be terminal
tg := alloc.Job.LookupTaskGroup(alloc.TaskGroup)
if tg == nil {
c.logger.Printf("[ERR] client: task group %q not found in job %q", tg.Name, alloc.Job.ID)
goto ADDALLOC
}
// Migrate the data from the remote node
prevAllocDir, err := c.migrateRemoteAllocDir(prevAlloc, alloc.ID)
if err != nil {
c.logger.Printf("[ERR] client: error migrating data from remote alloc %q: %v", alloc.PreviousAllocation, err)
// Wait for the remote previous alloc to be terminal if the alloc is sticky
if tg.EphemeralDisk.Sticky {
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
prevAlloc, err := c.waitForAllocTerminal(alloc.PreviousAllocation)
if err != nil {
c.logger.Printf("[ERR] client: error waiting for allocation %q: %v",
alloc.PreviousAllocation, err)
}
// Migrate the data from the remote node
prevAllocDir, err = c.migrateRemoteAllocDir(prevAlloc, alloc.ID)
if err != nil {
c.logger.Printf("[ERR] client: error migrating data from remote alloc %q: %v",
alloc.PreviousAllocation, err)
}
}
ADDALLOC:
// Add the allocation
if err := c.addAlloc(alloc, prevAllocDir); err != nil {
c.logger.Printf("[ERR] client: error adding alloc: %v", err)