Not moving alloc data when sticky is turned off #2017
Conversation
|
|
||
| // stripAllocation strips the allocation of fields which can be re-assembled in | ||
| // the server. | ||
| func (c *Client) stripAllocation(alloc *structs.Allocation) *structs.Allocation { |
There was a problem hiding this comment.
Can you have updateAllocStatus call this. Otherwise call sites may not do it.
There was a problem hiding this comment.
We will loose the information we need if we strip the allocation at the updateAllocStatus site. So this needs to be stripped before we send them over the wire.
There was a problem hiding this comment.
Also the updateAllocStatus pushes the alloc to a chan, and we are stripping the allocations when we receive them from the chan so it should be fine.
There was a problem hiding this comment.
Okay so allocSync seems like the wrong place to be adding that logic. That method is used just to batch updates. Can you move the logic to updateAllocStatus and revert back the stripAllocation changes because you will have the info you need there.
| @@ -1103,7 +1109,10 @@ func (c *Client) allocSync() { | |||
| if blockedAlloc, ok := c.blockedAllocations[alloc.ID]; ok && alloc.Terminated() { | |||
| var prevAllocDir *allocdir.AllocDir | |||
| if ar, ok := c.getAllocRunners()[alloc.ID]; ok { | |||
| prevAllocDir = ar.GetAllocDir() | |||
| tg := alloc.Job.LookupTaskGroup(alloc.TaskGroup) | |||
| if tg != nil && tg.EphemeralDisk.Sticky { | |||
There was a problem hiding this comment.
Check that EphemeralDisk isn't nil
| @@ -1393,7 +1404,7 @@ func (c *Client) runAllocs(update *allocUpdates) { | |||
| // previous allocation | |||
| var prevAllocDir *allocdir.AllocDir | |||
| tg := add.Job.LookupTaskGroup(add.TaskGroup) | |||
| if tg != nil && tg.EphemeralDisk.Sticky == true && ar != nil { | |||
| if tg != nil && tg.EphemeralDisk.Sticky && ar != nil { | |||
There was a problem hiding this comment.
Same here. You need to do a pull. There was a panic I fixed caused by not checking the EphemeralDisk block
|
I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions. |
No description provided.