/juju

Stopped State for opState (merge from PR #1855) #1897

Merged
merged 1 commit into from Mar 24, 2015

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@johnweldon @jujubot
@johnweldon
Contributor

johnweldon commented Mar 20, 2015

[Cherry-pick PR #1855 that was against 1.23, and has been reviewed there]

Instead of switching on opState.Hook.Kind we have a top level
opState.Stopped state to indicate a Stop hook has run.

Also, add upgrade steps to migrate previous uniter state versions to
this version.

Changes from review feedback:

  • only accept UnitTag in upgrade method
  • log error at Errorf level
  • don't use switch in simple case
  • added test for idempotency

(Review request: http://reviews.vapour.ws/r/1221/)
@johnweldon
Stopped State for opState 
 Instead of switching on opState.Hook.Kind we have a top level
 opState.Stopped state to indicate a Stop hook has run.

 Also, add upgrade steps to migrate previous uniter state versions to
 this version.

 Changes from review feedback:

 - only accept UnitTag in upgrade method
 - log error at Errorf level
 - don't use switch in simple case
 - added test for idempotency
 - collapse nested conditional
 - clarify warning message
 - add test for upgrade with missing uniter state file
 - remove UnsafeRead and UnsafeWrite from operation package
 - add private unsafeRead to uniter upgrade step
 - add private unsafeWrite to uniter upgrade tests
 - improve wording of logging in modes.go
032dd85

@johnweldon johnweldon referenced this pull request Mar 23, 2015

Merged

Actions in modehookerror :: Merge pull request #1914 from johnweldon/actions-in-modehookerror-1.23 #1920

@johnweldon
Contributor

johnweldon commented Mar 24, 2015

$$merge$$
@jujubot
Contributor

jujubot commented Mar 24, 2015

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

jujubot added a commit that referenced this pull request Mar 24, 2015

@jujubot
Merge pull request #1897 from johnweldon/opstate-hook-stopped-2 
Stopped State for opState (merge from PR #1855)

 [Cherry-pick PR #1855 that was against 1.23, and has been reviewed there]

 Instead of switching on opState.Hook.Kind we have a top level
 opState.Stopped state to indicate a Stop hook has run.

 Also, add upgrade steps to migrate previous uniter state versions to
 this version.

 Changes from review feedback:

 - only accept UnitTag in upgrade method
 - log error at Errorf level
 - don't use switch in simple case
 - added test for idempotency

(Review request: http://reviews.vapour.ws/r/1221/)
33c7a46

@jujubot jujubot merged commit 33c7a46 into juju:master Mar 24, 2015

@johnweldon johnweldon deleted the johnweldon:opstate-hook-stopped-2 branch Mar 24, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment