Skip to content

orchestrator/update: Update spec version when rolling back #2309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aaronlehmann merged 1 commit into from
Jul 20, 2017
Merged

orchestrator/update: Update spec version when rolling back #2309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions manager/orchestrator/replicated/update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,17 @@ import (
"golang.org/x/net/context"
)

func TestUpdaterRollbackAndPause(t *testing.T) {
testUpdaterRollback(t, api.UpdateConfig_PAUSE, true)
func TestUpdaterRollback(t *testing.T) {
t.Run("pause/monitor_set/spec_version_unset", func(t *testing.T) { testUpdaterRollback(t, api.UpdateConfig_PAUSE, true, false) })
t.Run("pause/monitor_set/spec_version_set", func(t *testing.T) { testUpdaterRollback(t, api.UpdateConfig_PAUSE, true, true) })
// skipped, see #2137
// t.Run("pause/monitor_unset/spec_version_unset", func(t *testing.T) { testUpdaterRollback(t, api.UpdateConfig_PAUSE, false, false) })
// t.Run("pause/monitor_unset/spec_version_set", func(t *testing.T) { testUpdaterRollback(t, api.UpdateConfig_PAUSE, false, true) })
t.Run("continue/spec_version_unset", func(t *testing.T) { testUpdaterRollback(t, api.UpdateConfig_CONTINUE, true, false) })
t.Run("continue/spec_version_set", func(t *testing.T) { testUpdaterRollback(t, api.UpdateConfig_CONTINUE, true, true) })
}

func TestUpdaterRollbackAndPauseNoMonitor(t *testing.T) {
t.Skip("skipping - see #2137")
testUpdaterRollback(t, api.UpdateConfig_PAUSE, false)
}

func TestUpdaterRollbackAndContinue(t *testing.T) {
testUpdaterRollback(t, api.UpdateConfig_CONTINUE, true)
}

func testUpdaterRollback(t *testing.T, rollbackFailureAction api.UpdateConfig_FailureAction, setMonitor bool) {
func testUpdaterRollback(t *testing.T, rollbackFailureAction api.UpdateConfig_FailureAction, setMonitor bool, useSpecVersion bool) {
ctx := context.Background()
s := store.NewMemoryStore(nil)
assert.NotNil(t, s)
Expand Down Expand Up @@ -134,6 +131,11 @@ func testUpdaterRollback(t *testing.T, rollbackFailureAction api.UpdateConfig_Fa
s1.Spec.Update.Monitor = gogotypes.DurationProto(500 * time.Millisecond)
s1.Spec.Rollback.Monitor = gogotypes.DurationProto(500 * time.Millisecond)
}
if useSpecVersion {
s1.SpecVersion = &api.Version{
Index: 1,
}
}

assert.NoError(t, store.CreateService(tx, s1))
return nil
Expand Down Expand Up @@ -168,8 +170,12 @@ func testUpdaterRollback(t *testing.T, rollbackFailureAction api.UpdateConfig_Fa
s1 := store.GetService(tx, "id1")
require.NotNil(t, s1)
s1.PreviousSpec = s1.Spec.Copy()
s1.PreviousSpecVersion = s1.SpecVersion.Copy()
s1.UpdateStatus = nil
s1.Spec.Task.GetContainer().Image = "image2"
if s1.SpecVersion != nil {
s1.SpecVersion.Index = 2
}
assert.NoError(t, store.UpdateService(tx, s1))
return nil
})
Expand Down Expand Up @@ -234,8 +240,12 @@ func testUpdaterRollback(t *testing.T, rollbackFailureAction api.UpdateConfig_Fa
s1 := store.GetService(tx, "id1")
require.NotNil(t, s1)
s1.PreviousSpec = s1.Spec.Copy()
s1.PreviousSpecVersion = s1.SpecVersion.Copy()
s1.UpdateStatus = nil
s1.Spec.Task.GetContainer().Image = "image2"
if s1.SpecVersion != nil {
s1.SpecVersion.Index = 2
}
assert.NoError(t, store.UpdateService(tx, s1))
return nil
})
Expand Down
2 changes: 2 additions & 0 deletions manager/orchestrator/update/updater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,9 @@ func (u *Updater) rollbackUpdate(ctx context.Context, serviceID, message string)
return errors.New("cannot roll back service because no previous spec is available")
}
service.Spec = *service.PreviousSpec
service.SpecVersion = service.PreviousSpecVersion.Copy()
service.PreviousSpec = nil
service.PreviousSpecVersion = nil

return store.UpdateService(tx, service)
})
Expand Down