From ad77c18c8739fc30c550c6cb825a5f96fc4c69d9 Mon Sep 17 00:00:00 2001 From: Preetha Appan Date: Thu, 18 Apr 2019 10:24:31 -0500 Subject: [PATCH] Add preemption related fields to AllocationListStub --- api/allocations.go | 46 ++++++++++--------- nomad/structs/structs.go | 96 +++++++++++++++++++++------------------- 2 files changed, 74 insertions(+), 68 deletions(-) diff --git a/api/allocations.go b/api/allocations.go index 109174f07529..eef1cd8ab570 100644 --- a/api/allocations.go +++ b/api/allocations.go @@ -155,28 +155,30 @@ type NodeScoreMeta struct { // AllocationListStub is used to return a subset of an allocation // during list operations. type AllocationListStub struct { - ID string - EvalID string - Name string - Namespace string - NodeID string - NodeName string - JobID string - JobType string - JobVersion uint64 - TaskGroup string - DesiredStatus string - DesiredDescription string - ClientStatus string - ClientDescription string - TaskStates map[string]*TaskState - DeploymentStatus *AllocDeploymentStatus - FollowupEvalID string - RescheduleTracker *RescheduleTracker - CreateIndex uint64 - ModifyIndex uint64 - CreateTime int64 - ModifyTime int64 + ID string + EvalID string + Name string + Namespace string + NodeID string + NodeName string + JobID string + JobType string + JobVersion uint64 + TaskGroup string + DesiredStatus string + DesiredDescription string + ClientStatus string + ClientDescription string + TaskStates map[string]*TaskState + DeploymentStatus *AllocDeploymentStatus + FollowupEvalID string + RescheduleTracker *RescheduleTracker + PreemptedAllocations []string + PreemptedByAllocation string + CreateIndex uint64 + ModifyIndex uint64 + CreateTime int64 + ModifyTime int64 } // AllocDeploymentStatus captures the status of the allocation as part of the diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go index 43dd3c438224..96910113934d 100644 --- a/nomad/structs/structs.go +++ b/nomad/structs/structs.go @@ -7627,57 +7627,61 @@ func (a *Allocation) LookupTask(name string) *Task { // Stub returns a list stub for the allocation func (a *Allocation) Stub() *AllocListStub { return &AllocListStub{ - ID: a.ID, - EvalID: a.EvalID, - Name: a.Name, - Namespace: a.Namespace, - NodeID: a.NodeID, - NodeName: a.NodeName, - JobID: a.JobID, - JobType: a.Job.Type, - JobVersion: a.Job.Version, - TaskGroup: a.TaskGroup, - DesiredStatus: a.DesiredStatus, - DesiredDescription: a.DesiredDescription, - ClientStatus: a.ClientStatus, - ClientDescription: a.ClientDescription, - DesiredTransition: a.DesiredTransition, - TaskStates: a.TaskStates, - DeploymentStatus: a.DeploymentStatus, - FollowupEvalID: a.FollowupEvalID, - RescheduleTracker: a.RescheduleTracker, - CreateIndex: a.CreateIndex, - ModifyIndex: a.ModifyIndex, - CreateTime: a.CreateTime, - ModifyTime: a.ModifyTime, + ID: a.ID, + EvalID: a.EvalID, + Name: a.Name, + Namespace: a.Namespace, + NodeID: a.NodeID, + NodeName: a.NodeName, + JobID: a.JobID, + JobType: a.Job.Type, + JobVersion: a.Job.Version, + TaskGroup: a.TaskGroup, + DesiredStatus: a.DesiredStatus, + DesiredDescription: a.DesiredDescription, + ClientStatus: a.ClientStatus, + ClientDescription: a.ClientDescription, + DesiredTransition: a.DesiredTransition, + TaskStates: a.TaskStates, + DeploymentStatus: a.DeploymentStatus, + FollowupEvalID: a.FollowupEvalID, + RescheduleTracker: a.RescheduleTracker, + PreemptedAllocations: a.PreemptedAllocations, + PreemptedByAllocation: a.PreemptedByAllocation, + CreateIndex: a.CreateIndex, + ModifyIndex: a.ModifyIndex, + CreateTime: a.CreateTime, + ModifyTime: a.ModifyTime, } } // AllocListStub is used to return a subset of alloc information type AllocListStub struct { - ID string - EvalID string - Name string - Namespace string - NodeID string - NodeName string - JobID string - JobType string - JobVersion uint64 - TaskGroup string - DesiredStatus string - DesiredDescription string - ClientStatus string - ClientDescription string - DesiredTransition DesiredTransition - TaskStates map[string]*TaskState - DeploymentStatus *AllocDeploymentStatus - FollowupEvalID string - RescheduleTracker *RescheduleTracker - CreateIndex uint64 - ModifyIndex uint64 - CreateTime int64 - ModifyTime int64 + ID string + EvalID string + Name string + Namespace string + NodeID string + NodeName string + JobID string + JobType string + JobVersion uint64 + TaskGroup string + DesiredStatus string + DesiredDescription string + ClientStatus string + ClientDescription string + DesiredTransition DesiredTransition + TaskStates map[string]*TaskState + DeploymentStatus *AllocDeploymentStatus + FollowupEvalID string + RescheduleTracker *RescheduleTracker + PreemptedAllocations []string + PreemptedByAllocation string + CreateIndex uint64 + ModifyIndex uint64 + CreateTime int64 + ModifyTime int64 } // SetEventDisplayMessage populates the display message if its not already set,