Fix bug 1728738, don't over write failure status if aborting model migration. #8088

Merged
merged 1 commit into from Nov 16, 2017

Conversation

Projects
None yet
4 participants
Member

hmlanigan commented Nov 16, 2017

Description of change

Skip setting migration status when aborting to facilitate finding the cause of the migration failure without hunting in the log file. Do continue to log the abort.

QA steps

Add a migrationmaster wrench with "die-in-export", try to migrate a model. The show-model, migration status should not be "aborted, removing model from target controller".

Documentation changes

N/A

Bug reference

https://bugs.launchpad.net/juju/+bug/1728738

Contributor

jujubot commented Nov 16, 2017

Can one of the admins verify this patch?

worker/migrationmaster/worker.go
@@ -612,7 +617,7 @@ func (w *Worker) doREAP() (coremigration.Phase, error) {
}
func (w *Worker) doABORT(targetInfo coremigration.TargetInfo, modelUUID string) (coremigration.Phase, error) {
- w.setInfoStatus("aborted, removing model from target controller")
+ w.logger.Infof("aborted, removing model from target controller")
@wallyworld

wallyworld Nov 16, 2017

Owner

should be Warningf I think?

Looks good to me!

Member

hmlanigan commented Nov 16, 2017

$$merge$$

Contributor

jujubot commented Nov 16, 2017

Status: merge request accepted. Url: http://ci.jujucharms.com/job/github-merge-juju

@jujubot jujubot merged commit babb0e1 into juju:develop Nov 16, 2017

1 check failed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details

@hmlanigan hmlanigan deleted the hmlanigan:bug1728738 branch Nov 16, 2017

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