state: pass in mgo.Session when opening State #8056

axw · 2017-11-13T09:08:42Z

Description of change

update state openers (Open, OpenController, Initialize) to accept an mgo.Session, rather than dialling from those methods. The session is copied, so the caller retains ownership of the session it passes in.
remove the State.MongoConnectionInfo and State.CACert methods, as they were relying on recording mongo connection info on the State object

QA steps

Smoke test: bootstrap, destroy.

Documentation changes

None.

Bug reference

None.

axw · 2017-11-13T09:10:31Z

Move Mongo dialling outside of state

wallyworld · 2017-11-13T09:31:00Z

apiserver/common/addresses.go

@@ -15,7 +17,7 @@ import (
 // controller addresses and the CA public certificate.
 type AddressAndCertGetter interface {


This interface name is now a bit inaccurate

I've renamed it, although the types in this file aren't very well scoped anyway. CA certs have bugger all to do with addresses, and what's the ModelUUID doing in there? Anyway.

wallyworld · 2017-11-13T09:34:41Z

apiserver/facades/client/applicationoffers/mock_test.go

@@ -492,8 +493,8 @@ func (m *mockState) APIHostPorts() ([][]network.HostPort, error) {
 	}, nil
 }

-func (m *mockState) CACert() string {
-	return testing.CACert
+func (m *mockState) ControllerConfig() (controller.Config, error) {


Is this used anywhere?

It was used for the backend of the APIAddresser. I've updated the PR with a commit to remove CACert from that interface.

wallyworld · 2017-11-13T09:37:53Z

apiserver/facades/client/client/instanceconfig.go

+	}
+	caCert, ok := controllerConfig.CACert()
+	if !ok {
+		return nil, errors.New("CA certificate missing from controller config")


Let's define NoCACertErr or something instead of the same string in several places.
Perhaps CACert() method itself on controllerConfig should return an error?

Ideally it would return neither a bool nor an error, since it's not possible to have controller config without a CA certificate past bootstrap. I'm ignoring the bool now, will add a card to change the controller.Config method.

wallyworld · 2017-11-13T09:38:41Z

apiserver/root.go

@@ -79,6 +79,7 @@ func newAPIHandler(srv *Server, st *state.State, rpcConn *rpc.Conn, modelUUID st
 		modelUUID:  modelUUID,
 		serverHost: serverHost,
 	}
+


do we need these?

need what? whitespace? accidentally snuck in as I added a resource, then removed it again - reverted

wallyworld · 2017-11-13T09:43:58Z

state/initialize.go

-	MongoInfo *mongo.MongoInfo
+	// MongoSession is the mgo.Session to use for storing and
+	// accessing state data. The caller remains responsible
+	// for closing the session.


for closing this session ??

(to distinguish from the copy that is made)

wallyworld · 2017-11-13T09:45:53Z

state/open.go

-	MongoDialOpts mongo.DialOpts
+	// MongoSession is the mgo.Session to use for storing and
+	// accessing state data. The caller remains responsible
+	// for closing the session; Open will copy it.


s/the/the passed in session?

Not sure if that clarification is needed? Makes sense to make the change to me anyway. YMMV

s/the/this/ like in the other case

wallyworld · 2017-11-13T09:48:31Z

state/state.go

+			} `bson:"authenticatedUsers"`
+		} `bson:"authInfo"`
+	}
+	if err := st.session.DB(jujuDB).Run(bson.D{{"connectionStatus", 1}}, &connectionStatus); err != nil {


Can you add a comment here? I don't quite grok this at first read.

yup - sorry, done

We shouldn't need to know about how to connect to MongoDB given a State object, we just need a connection.

This is a property of controller config, so use that where necessary, rather than relying on the CACert value in the mongo info.

No longer needed, so stop storing it. Next step is to stop passing it into State altogether, and instead just pass in a mgo.Session.

Functions in the State package that create State objects now accept an mgo.Session, rather than the mongo connection info and dial options. For now at least, they copy the session.

axw · 2017-11-14T07:58:17Z

$$merge$$

jujubot · 2017-11-14T08:00:06Z

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

jujubot · 2017-11-14T08:17:22Z

Build failed: Tests failed
build url: http://ci.jujucharms.com/job/github-merge-juju/505

Remove CACert from the APIAddresser type, which is embedded and exposed by various facades. Add CACert as a method directly to those facades that require it. Also remove CACert method from client-side APIAddresser type, and move to clients that require it.

axw · 2017-11-14T08:38:34Z

$$merge$$

jujubot · 2017-11-14T08:40:07Z

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

jujubot · 2017-11-14T09:12:24Z

Build failed: Tests failed
build url: http://ci.jujucharms.com/job/github-merge-juju/508

axw · 2017-11-14T09:44:58Z

$$merge$$

jujubot · 2017-11-14T09:46:07Z

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

axw · 2017-11-14T10:03:16Z

Build failed: it's a mystery

axw · 2017-11-14T10:03:25Z

$$merge$$

jujubot · 2017-11-14T10:04:07Z

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

nskaggs · 2017-11-14T16:49:54Z

$$merge$$

wallyworld reviewed Nov 13, 2017

View reviewed changes

wallyworld approved these changes Nov 13, 2017

View reviewed changes

axw added 3 commits November 14, 2017 14:13

state: remove State.MongoConnectionInfo method

1957a16

We shouldn't need to know about how to connect to MongoDB given a State object, we just need a connection.

state: remove State.CACert method

f347fbb

This is a property of controller config, so use that where necessary, rather than relying on the CACert value in the mongo info.

state: stop storing MongoInfo

5ad3d78

No longer needed, so stop storing it. Next step is to stop passing it into State altogether, and instead just pass in a mgo.Session.

axw force-pushed the open-state-mongo-session branch from be835f8 to 32673f8 Compare November 14, 2017 06:13

state: pass mgo.Session into openers

3f69037

Functions in the State package that create State objects now accept an mgo.Session, rather than the mongo connection info and dial options. For now at least, they copy the session.

axw force-pushed the open-state-mongo-session branch 2 times, most recently from 469bbed to d90d7f7 Compare November 14, 2017 07:57

axw force-pushed the open-state-mongo-session branch from d90d7f7 to 67aba93 Compare November 14, 2017 08:34

jujubot merged commit eff693a into juju:state-controller-refactor Nov 14, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

state: pass in mgo.Session when opening State #8056

state: pass in mgo.Session when opening State #8056

axw commented Nov 13, 2017

axw commented Nov 13, 2017

wallyworld Nov 13, 2017

axw Nov 14, 2017

wallyworld Nov 13, 2017

axw Nov 14, 2017

wallyworld Nov 13, 2017

axw Nov 14, 2017

wallyworld Nov 13, 2017

axw Nov 14, 2017

wallyworld Nov 13, 2017

axw Nov 14, 2017

wallyworld Nov 13, 2017

axw Nov 14, 2017

wallyworld Nov 13, 2017

axw Nov 14, 2017

axw commented Nov 14, 2017

jujubot commented Nov 14, 2017

jujubot commented Nov 14, 2017

axw commented Nov 14, 2017

jujubot commented Nov 14, 2017

jujubot commented Nov 14, 2017

axw commented Nov 14, 2017

jujubot commented Nov 14, 2017

axw commented Nov 14, 2017

axw commented Nov 14, 2017

jujubot commented Nov 14, 2017

nskaggs commented Nov 14, 2017

		@@ -15,7 +17,7 @@ import (
		// controller addresses and the CA public certificate.
		type AddressAndCertGetter interface {

state: pass in mgo.Session when opening State #8056

state: pass in mgo.Session when opening State #8056

Conversation

axw commented Nov 13, 2017

Description of change

QA steps

Documentation changes

Bug reference

axw commented Nov 13, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

axw commented Nov 14, 2017

jujubot commented Nov 14, 2017

jujubot commented Nov 14, 2017

axw commented Nov 14, 2017

jujubot commented Nov 14, 2017

jujubot commented Nov 14, 2017

axw commented Nov 14, 2017

jujubot commented Nov 14, 2017

axw commented Nov 14, 2017

axw commented Nov 14, 2017

jujubot commented Nov 14, 2017

nskaggs commented Nov 14, 2017