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

Adds comment to handleRollbackValidity method and other small test readability fixes.

Browse Source
This commit is contained in:
Preetha Appan
2017-11-03 16:49:16 -05:00
parent f92e564e76
commit 04feeef1cc
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
nomad/deploymentwatcher/deployment_watcher.go
View File

@@ -184,17 +184,20 @@ func (w *deploymentWatcher) SetAllocHealth(
w.setLatestEval(index)
return nil
}
func (w *deploymentWatcher) handleRollbackValidity(j *structs.Job, desc string) (*structs.Job, string) {
// handleRollbackValidity checks if the job being rolled back to has the same spec as the existing job
// Returns a modified description and job accordingly.
func (w *deploymentWatcher) handleRollbackValidity(rollbackJob *structs.Job, desc string) (*structs.Job, string) {
// Only rollback if job being changed has a different spec.
// This prevents an infinite revert cycle when a previously stable version of the job fails to start up during a rollback
// If the job we are trying to rollback to is identical to the current job, we stop because the rollback will not succeed.
if w.j.SpecChanged(j) {
desc = structs.DeploymentStatusDescriptionRollback(desc, j.Version)
if w.j.SpecChanged(rollbackJob) {
desc = structs.DeploymentStatusDescriptionRollback(desc, rollbackJob.Version)
} else {
desc = structs.DeploymentStatusDescriptionRollbackNoop(desc, j.Version)
j = nil
desc = structs.DeploymentStatusDescriptionRollbackNoop(desc, rollbackJob.Version)
rollbackJob = nil
}
return j, desc
return rollbackJob, desc
}
func (w *deploymentWatcher) PromoteDeployment(

4
nomad/deploymentwatcher/deployments_watcher_test.go
View File

@@ -905,9 +905,7 @@ func TestDeploymentWatcher_RollbackFailed(t *testing.T) {
// verify that the job version hasn't changed after upsert
m.state.JobByID(nil, structs.DefaultNamespace, j.ID)
if j.Version != 0 {
t.Fatalf("Expected job version 0 but got %v", j.Version)
}
assert.Equal(uint64(0), j.Version, "Expected job version 0 but got ", j.Version)
}
// Test evaluations are batched between watchers