Merge pull request #4250 from hashicorp/b-set-modifyindex-next-alloc

Update ModifyIndex of alloc when setting NextAllocation value
hashicorp · May 4, 2018 · 9281617 · 9281617
2 parents 86093d1 + 2718b09
commit 9281617
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/nomad/state/state_store.go b/nomad/state/state_store.go
@@ -2037,6 +2037,7 @@ func (s *StateStore) upsertAllocsImpl(index uint64, allocs []*structs.Allocation
 			if existingPrevAlloc != nil {
 				prevAllocCopy := existingPrevAlloc.Copy()
 				prevAllocCopy.NextAllocation = alloc.ID
+				prevAllocCopy.ModifyIndex = index
 				if err := txn.Insert("allocs", prevAllocCopy); err != nil {
 					return fmt.Errorf("alloc insert failed: %v", err)
 				}

diff --git a/nomad/state/state_store_test.go b/nomad/state/state_store_test.go
@@ -4653,6 +4653,15 @@ func TestStateStore_Allocs_PrevAlloc(t *testing.T) {
 
 	require.Equal(allocs, out)
 	require.False(watchFired(ws))
+
+	// Insert another alloc, verify index of previous alloc also got updated
+	alloc := mock.Alloc()
+	alloc.PreviousAllocation = allocs[0].ID
+	err = state.UpsertAllocs(1001, []*structs.Allocation{alloc})
+	require.Nil(err)
+	alloc0, err := state.AllocByID(nil, allocs[0].ID)
+	require.Nil(err)
+	require.Equal(alloc0.ModifyIndex, uint64(1001))
 }
 
 func TestStateStore_RestoreAlloc(t *testing.T) {