/juju

worker/migrationmaster: ABORT failure not status #6718

Merged
merged 2 commits into from Dec 15, 2016

Conversation

Reviewers

@babbageclunk babbageclunk

@howbazaar howbazaar

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@mjs @jujubot @babbageclunk @howbazaar
@mjs
Contributor

mjs commented Dec 15, 2016

A failure to remove the model from the target controller during ABORT is often completely normal (i.e. the migration never got to importing it). Don't record this failure to a migration status update as it obscures the real reason for the abort.

Drive-by: Correct docstring for MigrationTarget.Activate.

No QA necessary.
@mjs
worker/migrationmaster: ABORT failure not status 
A failure to remove the model from the target controller during ABORT is
often completely normal (i.e. the migration never got to importing
it). Don't record this failure to a migration status update as it
obscures the real reason for the abort.
364c875
@babbageclunk

babbageclunk approved these changes Dec 15, 2016
View changes

Other than the typo looks good.

apiserver/migrationtarget/migrationtarget.go
-// Activate sets the migration mode of the model to "active". It is an error to
-// attempt to Abort a model that has a migration mode other than importing.
+// Activate sets the migration mode of the model to "none", meaning it
+// is ready for us. It is an error to attempt to Abort a model that
@babbageclunk

babbageclunk Dec 15, 2016

Member

Tyop - should be "ready for youse [guys]".

@mjs
Contributor

mjs commented Dec 15, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Dec 15, 2016

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

@jujubot jujubot merged commit b16bafe into juju:2.1 Dec 15, 2016
1 check failed

1 check failed

github-check-merge-juju Built PR, ran unit tests, and tested LXD deploy. Use !!.*!! to request another build. IE, !!build!!, !!retry!!
Details

@mjs mjs referenced this pull request Jan 9, 2017

Merged

worker/migrationmaster: ABORT failure not status #6785

jujubot added a commit that referenced this pull request Jan 9, 2017

@jujubot
Merge pull request #6785 from mjs/MM-tweaks-develop 
worker/migrationmaster: ABORT failure not status

This is a forward port of #6718.

A failure to remove the model from the target controller during ABORT is often completely normal (i.e. the migration never got to importing it). Don't record this failure to a migration status update as it obscures the real reason for the abort.

Drive-by: Correct docstring for MigrationTarget.Activate.
98d517f

@mjs mjs deleted the mjs:MM-tweaks branch Feb 22, 2017

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