ignore delete events for now

nomad/fsm_test.go

@@ -2,7 +2,6 @@ package nomad
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"reflect"
 	"strings"
@@ -3249,11 +3248,13 @@ func TestFSM_SnapshotRestore_Events_WithDurability(t *testing.T) {
 
 	pub, err := state2.EventPublisher()
 	require.NoError(t, err)
+
 	testutil.WaitForResult(func() (bool, error) {
-		if pub.Len() == 2 {
+		plen := pub.Len()
+		if plen == 4 {
 			return true, nil
 		}
-		return false, errors.New("expected publisher to be populated")
+		return false, fmt.Errorf("expected publisher to have len 2 got: %d", plen)
 	}, func(err error) {
 		require.Fail(t, err.Error())
 	})

nomad/node_endpoint_test.go

@@ -1917,7 +1917,7 @@ func TestClientEndpoint_GetClientAllocs_Blocking_GC(t *testing.T) {
 	if time.Since(start) < 100*time.Millisecond {
 		t.Fatalf("too fast")
 	}
-	assert.EqualValues(200, resp3.Index)
+	assert.EqualValues(200, int(resp3.Index))
 	if assert.Len(resp3.Allocs, 1) {
 		assert.EqualValues(100, resp3.Allocs[alloc1.ID])
 	}

nomad/state/events.go

@@ -109,6 +109,9 @@ func GenericEventsFromChanges(tx ReadTxn, changes Changes) (*structs.Events, err
 	for _, change := range changes.Changes {
 		switch change.Table {
 		case "evals":
+			if change.Deleted() {
+				return nil, nil
+			}
 			after, ok := change.After.(*structs.Evaluation)
 			if !ok {
 				return nil, fmt.Errorf("transaction change was not an Evaluation")
@@ -127,6 +130,9 @@ func GenericEventsFromChanges(tx ReadTxn, changes Changes) (*structs.Events, err
 			events = append(events, event)
 
 		case "allocs":
+			if change.Deleted() {
+				return nil, nil
+			}
 			after, ok := change.After.(*structs.Allocation)
 			if !ok {
 				return nil, fmt.Errorf("transaction change was not an Allocation")
@@ -148,6 +154,9 @@ func GenericEventsFromChanges(tx ReadTxn, changes Changes) (*structs.Events, err
 
 			events = append(events, event)
 		case "jobs":
+			if change.Deleted() {
+				return nil, nil
+			}
 			after, ok := change.After.(*structs.Job)
 			if !ok {
 				return nil, fmt.Errorf("transaction change was not an Allocation")
@@ -165,6 +174,9 @@ func GenericEventsFromChanges(tx ReadTxn, changes Changes) (*structs.Events, err
 
 			events = append(events, event)
 		case "nodes":
+			if change.Deleted() {
+				return nil, nil
+			}
 			after, ok := change.After.(*structs.Node)
 			if !ok {
 				return nil, fmt.Errorf("transaction change was not a Node")

nomad/state/state_changes.go

@@ -170,7 +170,7 @@ func (tx *txn) Commit() error {
 			return err
 		}
 
-		if tx.persistChanges {
+		if tx.persistChanges && events != nil {
 			// persist events after processing changes
 			err := tx.Txn.Insert("events", events)
 			if err != nil {
@@ -224,12 +224,12 @@ func processDBChanges(tx ReadTxn, changes Changes) (*structs.Events, error) {
 	case structs.AllocUpdateRequestType:
 		// TODO(drew) test
 		return GenericEventsFromChanges(tx, changes)
-	case structs.JobDeregisterRequestType:
-		// TODO(drew) test
-		return GenericEventsFromChanges(tx, changes)
-	case structs.JobBatchDeregisterRequestType:
-		// TODO(drew) test
-		return GenericEventsFromChanges(tx, changes)
+	// case structs.JobDeregisterRequestType:
+	// TODO(drew) test / handle delete
+	// return GenericEventsFromChanges(tx, changes)
+	// case structs.JobBatchDeregisterRequestType:
+	// TODO(drew) test & handle delete
+	// return GenericEventsFromChanges(tx, changes)
 	case structs.AllocUpdateDesiredTransitionRequestType:
 		// TODO(drew) drain
 		return GenericEventsFromChanges(tx, changes)

nomad/state/state_store.go

@@ -2950,8 +2950,7 @@ func (s *StateStore) DeleteEval(index uint64, evals []string, allocs []string) e
 		return fmt.Errorf("setting job status failed: %v", err)
 	}
 
-	txn.Commit()
-	return nil
+	return txn.Commit()
 }
 
 // EvalByID is used to lookup an eval by its ID