juju-core

Merge lp:~axwalk/juju-core/replicaset-close-clone into lp:~go-bot/juju-core/trunk

  1. replicaset-close-clone
  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: 2737
Proposed branch: lp:~axwalk/juju-core/replicaset-close-clone
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 19 lines (+2/-0)
1 file modified
replicaset/replicaset.go (+2/-0)
To merge this branch: bzr merge lp:~axwalk/juju-core/replicaset-close-clone
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+219632@code.launchpad.net

Commit message

replicaset: close cloned sessions

Not sure if this is related to test failures,
but we should close cloned sessions anyway.

https://codereview.appspot.com/92400043/

Description of the change

replicaset: close cloned sessions

Not sure if this is related to test failures,
but we should close cloned sessions anyway.

https://codereview.appspot.com/92400043/

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

Reviewers: mp+219632_code.launchpad.net,

Message:
Please take a look.

Description:
replicaset: close cloned sessions

Not sure if this is related to test failures,
but we should close cloned sessions anyway.

https://code.launchpad.net/~axwalk/juju-core/replicaset-close-clone/+merge/219632

(do not edit description out of merge proposal)

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

Affected files (+4, -0 lines):
   A [revision details]
   M replicaset/replicaset.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-20140515024948-mdinmvuq3nkxrxxi
+New revision: <email address hidden>

Index: replicaset/replicaset.go
=== modified file 'replicaset/replicaset.go'
--- replicaset/replicaset.go 2014-04-15 16:37:08 +0000
+++ replicaset/replicaset.go 2014-05-15 05:16:56 +0000
@@ -28,6 +28,7 @@
  // details.
  func Initiate(session *mgo.Session, address, name string, tags
map[string]string) error {
   monotonicSession := session.Clone()
+ defer monotonicSession.Close()
   monotonicSession.SetMode(mgo.Monotonic, true)
   cfg := Config{
    Name: name,
@@ -276,6 +277,7 @@
  func CurrentConfig(session *mgo.Session) (*Config, error) {
   cfg := &Config{}
   monotonicSession := session.Clone()
+ defer monotonicSession.Close()
   monotonicSession.SetMode(mgo.Monotonic, true)
   err := monotonicSession.DB("local").C("system.replset").Find(nil).One(cfg)
   if err == mgo.ErrNotFound {

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

LGTM

https://codereview.appspot.com/92400043/

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

The attempt to merge lp:~axwalk/juju-core/replicaset-close-clone 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 0.953s
ok launchpad.net/juju-core/agent/mongo 0.441s
ok launchpad.net/juju-core/agent/tools 0.223s
ok launchpad.net/juju-core/bzr 5.048s
ok launchpad.net/juju-core/cert 2.202s
ok launchpad.net/juju-core/charm 0.369s
? 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.032s
ok launchpad.net/juju-core/cloudinit/sshinit 0.840s
ok launchpad.net/juju-core/cmd 0.202s
ok launchpad.net/juju-core/cmd/charm-admin 0.279s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/envcmd 0.149s
ok launchpad.net/juju-core/cmd/juju 225.439s
ok launchpad.net/juju-core/cmd/jujud 65.566s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 9.836s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.157s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.025s
ok launchpad.net/juju-core/container 0.036s
ok launchpad.net/juju-core/container/factory 0.037s
ok launchpad.net/juju-core/container/kvm 0.161s
ok launchpad.net/juju-core/container/kvm/mock 0.034s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 4.340s
? 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.253s
ok launchpad.net/juju-core/environs 2.329s
ok launchpad.net/juju-core/environs/bootstrap 12.837s
ok launchpad.net/juju-core/environs/cloudinit 0.426s
ok launchpad.net/juju-core/environs/config 2.730s
ok launchpad.net/juju-core/environs/configstore 0.034s
ok launchpad.net/juju-core/environs/filestorage 0.023s
ok launchpad.net/juju-core/environs/httpstorage 0.627s
ok launchpad.net/juju-core/environs/imagemetadata 0.420s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.044s
ok launchpad.net/juju-core/environs/jujutest 0.163s
ok launchpad.net/juju-core/environs/manual 12.116s
? launchpad.net/juju-core/environs/network [no test files]
ok launchpad.net/juju-core/environs/simplestreams 0.291s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 0.762s
ok launchpad.net/juju-core/environs/storage 0.903s
ok launchpad.net/juju-core/environs/sync 51.871s
ok launchpad.net/juju-core/environs/testing 0.134s
ok launchpad.net/juju-core/environs/tools 4.549s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/instance 0.019s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/ju...

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

The attempt to merge lp:~axwalk/juju-core/replicaset-close-clone into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.020s
ok launchpad.net/juju-core/agent 0.796s
ok launchpad.net/juju-core/agent/mongo 0.458s
ok launchpad.net/juju-core/agent/tools 0.208s
ok launchpad.net/juju-core/bzr 5.039s
ok launchpad.net/juju-core/cert 2.388s
ok launchpad.net/juju-core/charm 0.409s
? 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.031s
ok launchpad.net/juju-core/cloudinit/sshinit 0.805s
ok launchpad.net/juju-core/cmd 0.168s
ok launchpad.net/juju-core/cmd/charm-admin 0.246s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/envcmd 0.174s
ok launchpad.net/juju-core/cmd/juju 224.479s
ok launchpad.net/juju-core/cmd/jujud 65.753s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 8.545s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.234s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.026s
ok launchpad.net/juju-core/container 0.041s
ok launchpad.net/juju-core/container/factory 0.038s
ok launchpad.net/juju-core/container/kvm 0.204s
ok launchpad.net/juju-core/container/kvm/mock 0.035s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 4.302s
? 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.214s
ok launchpad.net/juju-core/environs 2.322s
ok launchpad.net/juju-core/environs/bootstrap 12.250s
ok launchpad.net/juju-core/environs/cloudinit 0.414s
ok launchpad.net/juju-core/environs/config 1.596s
ok launchpad.net/juju-core/environs/configstore 0.031s
ok launchpad.net/juju-core/environs/filestorage 0.027s
ok launchpad.net/juju-core/environs/httpstorage 0.660s
ok launchpad.net/juju-core/environs/imagemetadata 0.435s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.043s
ok launchpad.net/juju-core/environs/jujutest 0.154s
ok launchpad.net/juju-core/environs/manual 12.425s
? launchpad.net/juju-core/environs/network [no test files]
ok launchpad.net/juju-core/environs/simplestreams 0.268s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 0.904s
ok launchpad.net/juju-core/environs/storage 0.883s
ok launchpad.net/juju-core/environs/sync 52.458s
ok launchpad.net/juju-core/environs/testing 0.128s
ok launchpad.net/juju-core/environs/tools 4.862s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/instance 0.018s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/ju...

Revision history for this message
William Reade (fwereade) wrote :

I wish I could think of a way to test this. Oh, for interfaces :-/.

https://codereview.appspot.com/92400043/

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

The attempt to merge lp:~axwalk/juju-core/replicaset-close-clone into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.013s
ok launchpad.net/juju-core/agent 0.992s
ok launchpad.net/juju-core/agent/mongo 0.441s
ok launchpad.net/juju-core/agent/tools 0.180s
ok launchpad.net/juju-core/bzr 4.902s
ok launchpad.net/juju-core/cert 2.870s
ok launchpad.net/juju-core/charm 0.468s
? 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.734s
ok launchpad.net/juju-core/cmd 0.179s
ok launchpad.net/juju-core/cmd/charm-admin 0.266s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/envcmd 0.147s
ok launchpad.net/juju-core/cmd/juju 225.647s
ok launchpad.net/juju-core/cmd/jujud 66.288s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 9.803s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.170s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.027s
ok launchpad.net/juju-core/container 0.035s
ok launchpad.net/juju-core/container/factory 0.037s
ok launchpad.net/juju-core/container/kvm 0.172s
ok launchpad.net/juju-core/container/kvm/mock 0.035s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 4.284s
? 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.211s
ok launchpad.net/juju-core/environs 2.263s
ok launchpad.net/juju-core/environs/bootstrap 12.525s
ok launchpad.net/juju-core/environs/cloudinit 0.404s
ok launchpad.net/juju-core/environs/config 1.579s
ok launchpad.net/juju-core/environs/configstore 0.030s
ok launchpad.net/juju-core/environs/filestorage 0.024s
ok launchpad.net/juju-core/environs/httpstorage 0.654s
ok launchpad.net/juju-core/environs/imagemetadata 0.411s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.045s
ok launchpad.net/juju-core/environs/jujutest 0.188s
ok launchpad.net/juju-core/environs/manual 10.498s
? launchpad.net/juju-core/environs/network [no test files]
ok launchpad.net/juju-core/environs/simplestreams 0.304s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 0.862s
ok launchpad.net/juju-core/environs/storage 0.897s
ok launchpad.net/juju-core/environs/sync 52.566s
ok launchpad.net/juju-core/environs/testing 0.125s
ok launchpad.net/juju-core/environs/tools 4.463s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/instance 0.018s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/ju...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'replicaset/replicaset.go'
2--- replicaset/replicaset.go 2014-04-15 16:37:08 +0000
3+++ replicaset/replicaset.go 2014-05-15 05:20:33 +0000
4@@ -28,6 +28,7 @@
5 // details.
6 func Initiate(session *mgo.Session, address, name string, tags map[string]string) error {
7 monotonicSession := session.Clone()
8+ defer monotonicSession.Close()
9 monotonicSession.SetMode(mgo.Monotonic, true)
10 cfg := Config{
11 Name: name,
12@@ -276,6 +277,7 @@
13 func CurrentConfig(session *mgo.Session) (*Config, error) {
14 cfg := &Config{}
15 monotonicSession := session.Clone()
16+ defer monotonicSession.Close()
17 monotonicSession.SetMode(mgo.Monotonic, true)
18 err := monotonicSession.DB("local").C("system.replset").Find(nil).One(cfg)
19 if err == mgo.ErrNotFound {

Subscribers

People subscribed via source and target branches

to status/vote changes: