kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

job: ensure node pool is canonicalized for state restores. (#17765)

Browse Source
This commit is contained in:
James Rasell
2023-06-30 08:37:22 +02:00
committed by GitHub
parent 9e5fc77689
commit 1e0d691452
2 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nomad/state/state_store_restore.go
View File

@@ -44,6 +44,17 @@ func (r *StateRestore) NodePoolRestore(pool *structs.NodePool) error {
// JobRestore is used to restore a job
func (r *StateRestore) JobRestore(job *structs.Job) error {
// When upgrading a cluster pre to post 1.6, the existing jobs will not
// have a node pool set. Inserting this into the table will fail, as this
// is indexed and cannot be empty.
//
// This cannot happen within the job canonicalize function, as it would
// break the node pools and governance feature.
if job.NodePool == "" {
job.NodePool = structs.NodePoolDefault
}
if err := r.txn.Insert("jobs", job); err != nil {
return fmt.Errorf("job insert failed: %v", err)
}

40
nomad/state/state_store_restore_test.go
View File

@@ -50,28 +50,36 @@ func TestStateStore_RestoreJob(t *testing.T) {
ci.Parallel(t)
state := testStateStore(t)
job := mock.Job()
mockJob1 := mock.Job()
restore, err := state.Restore()
if err != nil {
t.Fatalf("err: %v", err)
}
must.NoError(t, err)
err = restore.JobRestore(job)
if err != nil {
t.Fatalf("err: %v", err)
}
require.NoError(t, restore.Commit())
err = restore.JobRestore(mockJob1)
must.NoError(t, err)
must.NoError(t, restore.Commit())
ws := memdb.NewWatchSet()
out, err := state.JobByID(ws, job.Namespace, job.ID)
if err != nil {
t.Fatalf("err: %v", err)
}
out, err := state.JobByID(ws, mockJob1.Namespace, mockJob1.ID)
must.NoError(t, err)
must.Eq(t, mockJob1, out)
if !reflect.DeepEqual(out, job) {
t.Fatalf("Bad: %#v %#v", out, job)
}
// Test upgrade to 1.6 or greater to simulate restoring a job which does
// not have a node pool set.
mockJob2 := mock.Job()
mockJob2.NodePool = ""
restore, err = state.Restore()
must.NoError(t, err)
err = restore.JobRestore(mockJob2)
must.NoError(t, err)
must.NoError(t, restore.Commit())
ws = memdb.NewWatchSet()
out, err = state.JobByID(ws, mockJob2.Namespace, mockJob2.ID)
must.NoError(t, err)
must.Eq(t, structs.NodePoolDefault, out.NodePool)
}
func TestStateStore_RestorePeriodicLaunch(t *testing.T) {