Merge pull request #3446 from hashicorp/f-modify-time-alloc

Add ModifyTime to Allocation and update it both on plan applies and c…

api/allocations.go

@@ -95,6 +95,7 @@ type Allocation struct {
 	ModifyIndex        uint64
 	AllocModifyIndex   uint64
 	CreateTime         int64
+	ModifyTime         int64
 }
 
 // AllocationMetric is used to deserialize allocation metrics.
@@ -132,11 +133,12 @@ type AllocationListStub struct {
 	CreateIndex        uint64
 	ModifyIndex        uint64
 	CreateTime         int64
+	ModifyTime         int64
 }
 
 // AllocDeploymentStatus captures the status of the allocation as part of the
 // deployment. This can include things like if the allocation has been marked as
-// heatlhy.
+// healthy.
 type AllocDeploymentStatus struct {
 	Healthy     *bool
 	ModifyIndex uint64

nomad/node_endpoint.go

@@ -774,6 +774,11 @@ func (n *Node) UpdateAlloc(args *structs.AllocUpdateRequest, reply *structs.Gene
 		return fmt.Errorf("must update at least one allocation")
 	}
 
+	// Update modified timestamp for client initiated allocation updates
+	now := time.Now().UTC().UnixNano()
+	for _, alloc := range args.Alloc {
+		alloc.ModifyTime = now
+	}
 	// Add this to the batch
 	n.updatesLock.Lock()
 	n.updates = append(n.updates, args.Alloc...)

nomad/node_endpoint_test.go

@@ -1406,8 +1406,10 @@ func TestClientEndpoint_GetAllocs_Blocking(t *testing.T) {
 	node.ModifyIndex = resp.Index
 
 	// Inject fake evaluations async
+	now := time.Now().UTC().UnixNano()
 	alloc := mock.Alloc()
 	alloc.NodeID = node.ID
+	alloc.ModifyTime = now
 	state := s1.fsm.State()
 	state.UpsertJobSummary(99, mock.JobSummary(alloc.JobID))
 	start := time.Now()
@@ -1445,6 +1447,10 @@ func TestClientEndpoint_GetAllocs_Blocking(t *testing.T) {
 		t.Fatalf("bad: %#v", resp2.Allocs)
 	}
 
+	if resp2.Allocs[0].ModifyTime != now {
+		t.Fatalf("Invalid modify time %v", resp2.Allocs[0].ModifyTime)
+	}
+
 	// Alloc updates fire watches
 	time.AfterFunc(100*time.Millisecond, func() {
 		allocUpdate := mock.Alloc()
@@ -1536,6 +1542,10 @@ func TestClientEndpoint_UpdateAlloc(t *testing.T) {
 	if out.ClientStatus != structs.AllocClientStatusFailed {
 		t.Fatalf("Bad: %#v", out)
 	}
+
+	if out.ModifyTime <= 0 {
+		t.Fatalf("must have valid modify time but was %v", out.ModifyTime)
+	}
 }
 
 func TestClientEndpoint_BatchUpdate(t *testing.T) {

nomad/plan_apply.go

@@ -150,6 +150,7 @@ func (s *Server) applyPlan(plan *structs.Plan, result *structs.PlanResult, snap
 		if alloc.CreateTime == 0 {
 			alloc.CreateTime = now
 		}
+		alloc.ModifyTime = now
 	}
 
 	// Dispatch the Raft transaction

nomad/plan_apply_test.go

@@ -147,6 +147,16 @@ func TestPlanApply_applyPlan(t *testing.T) {
 		t.Fatalf("missing alloc")
 	}
 
+	if out.CreateTime <= 0 {
+		t.Fatalf("invalid create time %v", out.CreateTime)
+	}
+	if out.ModifyTime <= 0 {
+		t.Fatalf("invalid modify time %v", out.CreateTime)
+	}
+	if out.CreateTime != out.ModifyTime {
+		t.Fatalf("create time %v modify time %v must be equal", out.CreateTime, out.ModifyTime)
+	}
+
 	// Lookup the new deployment
 	dout, err := fsmState.DeploymentByID(ws, plan.Deployment.ID)
 	if err != nil {
@@ -226,6 +236,10 @@ func TestPlanApply_applyPlan(t *testing.T) {
 		t.Fatalf("missing job")
 	}
 
+	if out.ModifyTime <= 0 {
+		t.Fatalf("must have valid modify time but was %v", out.ModifyTime)
+	}
+
 	// Lookup the allocation
 	out, err = s1.fsm.State().AllocByID(ws, alloc2.ID)
 	if err != nil {

nomad/state/state_store.go

@@ -1718,6 +1718,9 @@ func (s *StateStore) nestedUpdateAllocFromClient(txn *memdb.Txn, index uint64, a
 	// Update the modify index
 	copyAlloc.ModifyIndex = index
 
+	// Update the modify time
+	copyAlloc.ModifyTime = alloc.ModifyTime
+
 	if err := s.updateDeploymentWithAlloc(index, copyAlloc, exist, txn); err != nil {
 		return fmt.Errorf("error updating deployment: %v", err)
 	}