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

Merge pull request #5025 from hashicorp/dani/allocLockCleanup 

client: Cleanup allocrunner access
This commit is contained in:
Danielle Tomlinson 2019-01-11 23:35:02 +01:00 committed by GitHub
parent 588e3401d0 3e586e93da
commit 6c0d30caa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
client/client.go
View File

@ -700,6 +700,18 @@ func (c *Client) Node() *structs.Node {
return c.configCopy.Node
}
func (c *Client) getAllocRunner(allocID string) (AllocRunner, error) {
c.allocLock.RLock()
defer c.allocLock.RUnlock()
ar, ok := c.allocs[allocID]
if !ok {
return nil, structs.NewErrUnknownAllocation(allocID)
}
return ar, nil
}
// StatsReporter exposes the various APIs related resource usage of a Nomad
// client
func (c *Client) StatsReporter() ClientStatsReporter {
@ -707,11 +719,9 @@ func (c *Client) StatsReporter() ClientStatsReporter {
}
func (c *Client) GetAllocStats(allocID string) (interfaces.AllocStatsReporter, error) {
c.allocLock.RLock()
defer c.allocLock.RUnlock()
ar, ok := c.allocs[allocID]
if !ok {
return nil, structs.NewErrUnknownAllocation(allocID)
ar, err := c.getAllocRunner(allocID)
if err != nil {
return nil, err
}
return ar.StatsReporter(), nil
}
@ -790,12 +800,9 @@ func (c *Client) ValidateMigrateToken(allocID, migrateToken string) bool {
// GetAllocFS returns the AllocFS interface for the alloc dir of an allocation
func (c *Client) GetAllocFS(allocID string) (allocdir.AllocDirFS, error) {
c.allocLock.RLock()
defer c.allocLock.RUnlock()
ar, ok := c.allocs[allocID]
if !ok {
return nil, structs.NewErrUnknownAllocation(allocID)
ar, err := c.getAllocRunner(allocID)
if err != nil {
return nil, err
}
return ar.GetAllocDir(), nil
@ -804,11 +811,9 @@ func (c *Client) GetAllocFS(allocID string) (allocdir.AllocDirFS, error) {
// GetAllocState returns a copy of an allocation's state on this client. It
// returns either an AllocState or an unknown allocation error.
func (c *Client) GetAllocState(allocID string) (*arstate.State, error) {
c.allocLock.RLock()
ar, ok := c.allocs[allocID]
c.allocLock.RUnlock()
if !ok {
return nil, structs.NewErrUnknownAllocation(allocID)
ar, err := c.getAllocRunner(allocID)
if err != nil {
return nil, err
}
return ar.AllocState(), nil
@ -1595,11 +1600,9 @@ func (c *Client) AllocStateUpdated(alloc *structs.Allocation) {
// Terminated, mark for GC if we're still tracking this alloc
// runner. If it's not being tracked that means the server has
// already GC'd it (see removeAlloc).
c.allocLock.RLock()
ar, ok := c.allocs[alloc.ID]
c.allocLock.RUnlock()
ar, err := c.getAllocRunner(alloc.ID)
if ok {
if err == nil {
c.garbageCollector.MarkForCollection(alloc.ID, ar)
// Trigger a GC in case we're over thresholds and just
@ -1948,9 +1951,10 @@ func (c *Client) runAllocs(update *allocUpdates) {
func (c *Client) removeAlloc(allocID string) {
c.allocLock.Lock()
defer c.allocLock.Unlock()
ar, ok := c.allocs[allocID]
if !ok {
c.logger.Warn("cannot remove nonexistent alloc", "alloc_id", allocID)
c.logger.Warn("cannot remove alloc", "alloc_id", allocID, "error", "alloc not found")
return
}
@ -1967,10 +1971,8 @@ func (c *Client) removeAlloc(allocID string) {
// updateAlloc is invoked when we should update an allocation
func (c *Client) updateAlloc(update *structs.Allocation) {
c.allocLock.RLock()
ar, ok := c.allocs[update.ID]
c.allocLock.RUnlock()
if !ok {
ar, err := c.getAllocRunner(update.ID)
if err != nil {
c.logger.Warn("cannot update nonexistent alloc", "alloc_id", update.ID)
return
}