juju-core

Merge lp:~axwalk/juju-core/spurious-bootstrap-error-message into lp:~go-bot/juju-core/trunk

  1. spurious-bootstrap-error-message
  2. Merge into trunk
Proposed by Andrew Wilkins
Status: Merged
Approved by: Andrew Wilkins
Approved revision: no longer in the source branch.
Merged at revision: 2482
Proposed branch: lp:~axwalk/juju-core/spurious-bootstrap-error-message
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 26 lines (+3/-3)
1 file modified
cmd/juju/common.go (+3/-3)
To merge this branch: bzr merge lp:~axwalk/juju-core/spurious-bootstrap-error-message
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+212764@code.launchpad.net

Commit message

cmd/juju: fix spurious "bootstrap failed" message

https://codereview.appspot.com/80330043/

Description of the change

cmd/juju: fix spurious "bootstrap failed" message

https://codereview.appspot.com/80330043/

To post a comment you must log in.
Revision history for this message
Andrew Wilkins (axwalk) wrote :

Reviewers: mp+212764_code.launchpad.net,

Message:
Please take a look.

Description:
cmd/juju: fix spurious "bootstrap failed" message

https://code.launchpad.net/~axwalk/juju-core/spurious-bootstrap-error-message/+merge/212764

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/80330043/

Affected files (+5, -3 lines):
   A [revision details]
   M cmd/juju/common.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140326035623-w7f2b0xv9aqx49nu
+New revision: <email address hidden>

Index: cmd/juju/common.go
=== modified file 'cmd/juju/common.go'
--- cmd/juju/common.go 2014-03-26 03:30:35 +0000
+++ cmd/juju/common.go 2014-03-26 04:36:17 +0000
@@ -11,10 +11,11 @@
  )

  // destroyPreparedEnviron destroys the environment and logs an error if it
fails.
-func destroyPreparedEnviron(env environs.Environ, store
configstore.Storage, err *error, action string) {
+func destroyPreparedEnviron(ctx *cmd.Context, env environs.Environ, store
configstore.Storage, err *error, action string) {
   if *err == nil {
    return
   }
+ ctx.Infof("%s failed, destroying environment", action)
   if err := environs.Destroy(env, store); err != nil {
    logger.Errorf("%s failed, and the environment could not be
destroyed: %v", action, err)
   }
@@ -39,8 +40,7 @@
   }
   cleanup := func() {
    if !existing {
- ctx.Infof("%s failed, destroying environment", action)
- destroyPreparedEnviron(environ, store, resultErr, action)
+ destroyPreparedEnviron(ctx, environ, store, resultErr, action)
    }
   }
   return environ, cleanup, nil

Revision history for this message
Ian Booth (wallyworld) wrote :

LGTM

https://codereview.appspot.com/80330043/

Revision history for this message
Go Bot (go-bot) wrote :
Download full text (47.0 KiB)

The attempt to merge lp:~axwalk/juju-core/spurious-bootstrap-error-message into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.014s
ok launchpad.net/juju-core/agent 1.095s
ok launchpad.net/juju-core/agent/mongo 0.546s
ok launchpad.net/juju-core/agent/tools 0.187s
ok launchpad.net/juju-core/bzr 5.610s
ok launchpad.net/juju-core/cert 2.859s
ok launchpad.net/juju-core/charm 0.401s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.030s
ok launchpad.net/juju-core/cloudinit/sshinit 0.932s
ok launchpad.net/juju-core/cmd 0.135s
ok launchpad.net/juju-core/cmd/charm-admin 0.730s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 200.784s
ok launchpad.net/juju-core/cmd/jujud 64.224s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 10.426s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.232s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.021s
ok launchpad.net/juju-core/container 0.038s
ok launchpad.net/juju-core/container/factory 0.050s
ok launchpad.net/juju-core/container/kvm 0.241s
ok launchpad.net/juju-core/container/kvm/mock 0.043s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 4.300s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
? launchpad.net/juju-core/container/testing [no test files]
ok launchpad.net/juju-core/downloader 5.209s
ok launchpad.net/juju-core/environs 2.197s
ok launchpad.net/juju-core/environs/bootstrap 10.330s
ok launchpad.net/juju-core/environs/cloudinit 0.456s
ok launchpad.net/juju-core/environs/config 2.424s
ok launchpad.net/juju-core/environs/configstore 0.031s
ok launchpad.net/juju-core/environs/filestorage 0.026s
ok launchpad.net/juju-core/environs/httpstorage 0.719s
ok launchpad.net/juju-core/environs/imagemetadata 0.422s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.042s
ok launchpad.net/juju-core/environs/jujutest 0.168s
ok launchpad.net/juju-core/environs/manual 14.131s
ok launchpad.net/juju-core/environs/simplestreams 0.273s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 0.919s
ok launchpad.net/juju-core/environs/storage 1.036s
ok launchpad.net/juju-core/environs/sync 43.575s
ok launchpad.net/juju-core/environs/testing 0.161s
ok launchpad.net/juju-core/environs/tools 4.777s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.011s
ok launchpad.net/juju-core/instance 0.018s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 18.764s
ok launchpad.net/juju-core/juju/...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmd/juju/common.go'
2--- cmd/juju/common.go 2014-03-26 03:30:35 +0000
3+++ cmd/juju/common.go 2014-03-26 04:38:01 +0000
4@@ -11,10 +11,11 @@
5 )
6
7 // destroyPreparedEnviron destroys the environment and logs an error if it fails.
8-func destroyPreparedEnviron(env environs.Environ, store configstore.Storage, err *error, action string) {
9+func destroyPreparedEnviron(ctx *cmd.Context, env environs.Environ, store configstore.Storage, err *error, action string) {
10 if *err == nil {
11 return
12 }
13+ ctx.Infof("%s failed, destroying environment", action)
14 if err := environs.Destroy(env, store); err != nil {
15 logger.Errorf("%s failed, and the environment could not be destroyed: %v", action, err)
16 }
17@@ -39,8 +40,7 @@
18 }
19 cleanup := func() {
20 if !existing {
21- ctx.Infof("%s failed, destroying environment", action)
22- destroyPreparedEnviron(environ, store, resultErr, action)
23+ destroyPreparedEnviron(ctx, environ, store, resultErr, action)
24 }
25 }
26 return environ, cleanup, nil

Subscribers

People subscribed via source and target branches

to status/vote changes: