Merge into trunk : lp1300889-disable-mongo-keyfile : Code : juju-core

Status:

Merged

Approved by:

Andrew Wilkins on 2014-04-02

Approved revision:

no longer in the source branch.

Merged at revision:

2544

Proposed branch:

lp:~axwalk/juju-core/lp1300889-disable-mongo-keyfile

Merge into:

lp:~go-bot/juju-core/trunk

Diff against target:

50 lines (+7/-6)

2 files modified

agent/mongo/mongo.go (+5/-4)
environs/cloudinit/cloudinit_test.go (+2/-2)

To merge this branch:

bzr merge lp:~axwalk/juju-core/lp1300889-disable-mongo-keyfile

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Juju Engineering		2014-04-02	Pending
Review via email: mp+213786@code.launchpad.net

Commit message

Disable --keyFile in mongo upstart config

We can't enable this yet, because shared-secret
isn't written until after Mongo is started. This
will change when EnsureMongoServer is landed.

(FWIW I did test this with local, and it worked.
I don't yet understand why - it shouldn't be any
different to cloud providers. I suspect there's
a race here with upstart restarting Mongo, and
the machine agnet writing the shared-secret.)

Fixes lp:1300889

https://codereview.appspot.com/83270045/

Description of the change

Disable --keyFile in mongo upstart config

We can't enable this yet, because shared-secret
isn't written until after Mongo is started. This
will change when EnsureMongoServer is landed.

(FWIW I did test this with local, and it worked.
I don't yet understand why - it shouldn't be any
different to cloud providers. I suspect there's
a race here with upstart restarting Mongo, and
the machine agnet writing the shared-secret.)

Fixes lp:1300889

https://codereview.appspot.com/83270045/

Revision history for this message

Andrew Wilkins (axwalk) wrote on 2014-04-02:

#

Download full text (4.8 KiB)

Reviewers: mp+213786_code.launchpad.net,

Message:
Please take a look.

Description:
Disable --keyFile in mongo upstart config

We can't enable this yet, because shared-secret
isn't written until after Mongo is started. This
will change when EnsureMongoServer is landed.

(FWIW I did test this with local, and it worked.
I don't yet understand why - it shouldn't be any
different to cloud providers. I suspect there's
a race here with upstart restarting Mongo, and
the machine agnet writing the shared-secret.)

Fixes lp:1300889

https://code.launchpad.net/~axwalk/juju-core/lp1300889-disable-mongo-keyfile/+merge/213786

(do not edit description out of merge proposal)

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

Affected files (+8, -6 lines):
   A [revision details]
   M agent/mongo/mongo.go
   M environs/cloudinit/cloudinit_test.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-20140402083906-5vacuo7ovpzyi5gj
+New revision: <email address hidden>

Index: agent/mongo/mongo.go
=== modified file 'agent/mongo/mongo.go'
--- agent/mongo/mongo.go 2014-04-01 09:34:43 +0000
+++ agent/mongo/mongo.go 2014-04-02 09:07:52 +0000
@@ -188,7 +188,7 @@
func MongoUpstartService(name, mongodExec, dataDir string, port int)
(*upstart.Conf, error) {

sslKeyFile := path.Join(dataDir, "server.pem")
- keyFile := path.Join(dataDir, SharedSecretFile)
+ //keyFile := path.Join(dataDir, SharedSecretFile)
svc := upstart.NewService(name)

   dbDir := path.Join(dataDir, "db")
@@ -210,11 +210,11 @@
     " --port " + fmt.Sprint(port) +
     " --noprealloc" +
     " --syslog" +
- " --smallfiles" +
- " --keyFile " + utils.ShQuote(keyFile),
+ " --smallfiles",
    // TODO(Nate): uncomment when we commit HA stuff
    // +
- // " --replSet juju",
+ // " --replSet juju" +
+ // " --keyFile " + utils.ShQuote(keyFile),
   }
   return conf, nil
  }

Index: environs/cloudinit/cloudinit_test.go
=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go 2014-04-01 08:19:52 +0000
+++ environs/cloudinit/cloudinit_test.go 2014-04-02 09:07:52 +0000
@@ -142,7 +142,7 @@
  dd bs=1M count=1 if=/dev/zero of=/var/lib/juju/db/journal/prealloc\.1
  dd bs=1M count=1 if=/dev/zero of=/var/lib/juju/db/journal/prealloc\.2
  echo 'Starting MongoDB server \(juju-db\)'.*
-cat >> /etc/init/juju-db\.conf << 'EOF'\\ndescription "juju state
database"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on
runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit
0\\n\\nlimit nofile 65000 65000\\nlimit nproc 20000 20000\\n\\nexec
/usr/bin/mongod --auth --dbpath=/var/lib/juju/db --sslOnNormalPorts
--sslPEMKeyFile '/var/lib/juju/server\.pem' --sslPEMKeyPassword ignored
--bind_ip 0\.0\.0\.0 --port 37017 --noprealloc --syslog --smallfiles
--keyFile '/var/lib/juju/shared-secret'\\nEOF\\n
+cat >> /etc/init/juju-db\.conf << 'EOF'\\ndescription "juju state
database"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on
runlevel...

Reviewers: mp+213786_code.launchpad.net,

Message:
Please take a look.

Description:
Disable --keyFile in mongo upstart config

We can't enable this yet, because shared-secret
isn't written until after Mongo is started. This
will change when EnsureMongoServer is landed.

(FWIW I did test this with local, and it worked.
I don't yet understand why - it shouldn't be any
different to cloud providers. I suspect there's
a race here with upstart restarting Mongo, and
the machine agnet writing the shared-secret.)

Fixes lp:1300889

https://code.launchpad.net/~axwalk/juju-core/lp1300889-disable-mongo-keyfile/+merge/213786

(do not edit description out of merge proposal)

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

Affected files (+8, -6 lines):
   A [revision details]
   M agent/mongo/mongo.go
   M environs/cloudinit/cloudinit_test.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-20140402083906-5vacuo7ovpzyi5gj
+New revision: andrew.wilkins@canonical.com-20140402090752-ydyr4228xmsm5nye

Index: agent/mongo/mongo.go
=== modified file 'agent/mongo/mongo.go'
--- agent/mongo/mongo.go	2014-04-01 09:34:43 +0000
+++ agent/mongo/mongo.go	2014-04-02 09:07:52 +0000
@@ -188,7 +188,7 @@
  func MongoUpstartService(name, mongodExec, dataDir string, port int)  
(*upstart.Conf, error) {

sslKeyFile := path.Join(dataDir, "server.pem")
-	keyFile := path.Join(dataDir, SharedSecretFile)
+	//keyFile := path.Join(dataDir, SharedSecretFile)
  	svc := upstart.NewService(name)

dbDir := path.Join(dataDir, "db")
@@ -210,11 +210,11 @@
  			" --port " + fmt.Sprint(port) +
  			" --noprealloc" +
  			" --syslog" +
-			" --smallfiles" +
-			" --keyFile " + utils.ShQuote(keyFile),
+			" --smallfiles",
  		// TODO(Nate): uncomment when we commit HA stuff
  		// +
-		//	" --replSet juju",
+		//	" --replSet juju" +
+		//	" --keyFile " + utils.ShQuote(keyFile),
  	}
  	return conf, nil
  }

Index: environs/cloudinit/cloudinit_test.go
=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go	2014-04-01 08:19:52 +0000
+++ environs/cloudinit/cloudinit_test.go	2014-04-02 09:07:52 +0000
@@ -142,7 +142,7 @@
  dd bs=1M count=1 if=/dev/zero of=/var/lib/juju/db/journal/prealloc\.1
  dd bs=1M count=1 if=/dev/zero of=/var/lib/juju/db/journal/prealloc\.2
  echo 'Starting MongoDB server \(juju-db\)'.*
-cat >> /etc/init/juju-db\.conf << 'EOF'\\ndescription "juju state  
database"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on  
runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit  
0\\n\\nlimit nofile 65000 65000\\nlimit nproc 20000 20000\\n\\nexec  
/usr/bin/mongod --auth --dbpath=/var/lib/juju/db --sslOnNormalPorts  
--sslPEMKeyFile '/var/lib/juju/server\.pem' --sslPEMKeyPassword ignored  
--bind_ip 0\.0\.0\.0 --port 37017 --noprealloc --syslog --smallfiles  
--keyFile '/var/lib/juju/shared-secret'\\nEOF\\n
+cat >> /etc/init/juju-db\.conf << 'EOF'\\ndescription "juju state  
database"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on  
runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit  
0\\n\\nlimit nofile 65000 65000\\nlimit nproc 20000 20000\\n\\nexec  
/usr/bin/mongod --auth --dbpath=/var/lib/juju/db --sslOnNormalPorts  
--sslPEMKeyFile '/var/lib/juju/server\.pem' --sslPEMKeyPassword ignored  
--bind_ip 0\.0\.0\.0 --port 37017 --noprealloc --syslog  
--smallfiles\\nEOF\\n
  start juju-db
  mkdir -p '/var/lib/juju/agents/bootstrap'
  install -m 600 /dev/null '/var/lib/juju/agents/bootstrap/agent\.conf'
@@ -236,7 +236,7 @@
  		inexactMatch: true,
  		expectScripts: `
  echo 'Starting MongoDB server \(juju-db\)'.*
-cat >> /etc/init/juju-db\.conf << 'EOF'\\ndescription "juju state  
database"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on  
runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit  
0\\n\\nlimit nofile 65000 65000\\nlimit nproc 20000 20000\\n\\nexec  
/usr/lib/juju/bin/mongod --auth --dbpath=/var/lib/juju/db  
--sslOnNormalPorts --sslPEMKeyFile '/var/lib/juju/server\.pem'  
--sslPEMKeyPassword ignored --bind_ip 0\.0\.0\.0 --port 37017 --noprealloc  
--syslog --smallfiles --keyFile '/var/lib/juju/shared-secret'\\nEOF\\n
+cat >> /etc/init/juju-db\.conf << 'EOF'\\ndescription "juju state  
database"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on  
runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit  
0\\n\\nlimit nofile 65000 65000\\nlimit nproc 20000 20000\\n\\nexec  
/usr/lib/juju/bin/mongod --auth --dbpath=/var/lib/juju/db  
--sslOnNormalPorts --sslPEMKeyFile '/var/lib/juju/server\.pem'  
--sslPEMKeyPassword ignored --bind_ip 0\.0\.0\.0 --port 37017 --noprealloc  
--syslog --smallfiles\\nEOF\\n
  `,
  	}, {
  		// non state server.

Revision history for this message

Roger Peppe (rogpeppe) wrote on 2014-04-02:

#

On 2014/04/02 09:24:13, axw wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/83270045/

Revision history for this message

William Reade (fwereade) wrote on 2014-04-02:

#

Add a matching comment for the commented `keyFile :=` line and LGTM.

(I don't really love this "uncomment when" lark, fwiw, but it'll do so
long as it really *does* get uncommented in short order ;))

https://codereview.appspot.com/83270045/

Revision history for this message

Andrew Wilkins (axwalk) wrote on 2014-04-02:

#

Please take a look.

https://codereview.appspot.com/83270045/

Revision history for this message

Go Bot (go-bot) wrote on 2014-04-02:

#

Download full text (18.4 KiB)

The attempt to merge lp:~axwalk/juju-core/lp1300889-disable-mongo-keyfile into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.015s
ok launchpad.net/juju-core/agent 1.101s
ok launchpad.net/juju-core/agent/mongo 0.543s
ok launchpad.net/juju-core/agent/tools 0.213s
ok launchpad.net/juju-core/bzr 5.104s
ok launchpad.net/juju-core/cert 2.896s
ok launchpad.net/juju-core/charm 0.402s
? 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.977s
ok launchpad.net/juju-core/cmd 0.172s
ok launchpad.net/juju-core/cmd/charm-admin 0.763s
? 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.209s
ok launchpad.net/juju-core/cmd/juju 208.978s
ok launchpad.net/juju-core/cmd/jujud 67.162s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 10.026s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.238s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.037s
ok launchpad.net/juju-core/container 0.028s
ok launchpad.net/juju-core/container/factory 0.033s
ok launchpad.net/juju-core/container/kvm 0.201s
ok launchpad.net/juju-core/container/kvm/mock 0.037s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 4.317s
? 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.251s
ok launchpad.net/juju-core/environs 2.575s
ok launchpad.net/juju-core/environs/bootstrap 10.213s
ok launchpad.net/juju-core/environs/cloudinit 0.497s
ok launchpad.net/juju-core/environs/config 2.622s
ok launchpad.net/juju-core/environs/configstore 0.032s
ok launchpad.net/juju-core/environs/filestorage 0.028s
ok launchpad.net/juju-core/environs/httpstorage 0.699s
ok launchpad.net/juju-core/environs/imagemetadata 0.450s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.037s
ok launchpad.net/juju-core/environs/jujutest 0.175s
ok launchpad.net/juju-core/environs/manual 12.565s
ok launchpad.net/juju-core/environs/simplestreams 0.263s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 0.834s
ok launchpad.net/juju-core/environs/storage 0.921s
ok launchpad.net/juju-core/environs/sync 43.749s
ok launchpad.net/juju-core/environs/testing 0.137s
ok launchpad.net/juju-core/environs/tools 4.761s
? 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.019s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/j...

The attempt to merge lp:~axwalk/juju-core/lp1300889-disable-mongo-keyfile into lp:juju-core failed. Below is the output from the failed tests.

ok  	launchpad.net/juju-core	0.015s
ok  	launchpad.net/juju-core/agent	1.101s
ok  	launchpad.net/juju-core/agent/mongo	0.543s
ok  	launchpad.net/juju-core/agent/tools	0.213s
ok  	launchpad.net/juju-core/bzr	5.104s
ok  	launchpad.net/juju-core/cert	2.896s
ok  	launchpad.net/juju-core/charm	0.402s
?   	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.977s
ok  	launchpad.net/juju-core/cmd	0.172s
ok  	launchpad.net/juju-core/cmd/charm-admin	0.763s
?   	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.209s
ok  	launchpad.net/juju-core/cmd/juju	208.978s
ok  	launchpad.net/juju-core/cmd/jujud	67.162s
ok  	launchpad.net/juju-core/cmd/plugins/juju-metadata	10.026s
?   	launchpad.net/juju-core/cmd/plugins/juju-restore	[no test files]
ok  	launchpad.net/juju-core/cmd/plugins/local	0.238s
?   	launchpad.net/juju-core/cmd/plugins/local/juju-local	[no test files]
ok  	launchpad.net/juju-core/constraints	0.037s
ok  	launchpad.net/juju-core/container	0.028s
ok  	launchpad.net/juju-core/container/factory	0.033s
ok  	launchpad.net/juju-core/container/kvm	0.201s
ok  	launchpad.net/juju-core/container/kvm/mock	0.037s
?   	launchpad.net/juju-core/container/kvm/testing	[no test files]
ok  	launchpad.net/juju-core/container/lxc	4.317s
?   	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.251s
ok  	launchpad.net/juju-core/environs	2.575s
ok  	launchpad.net/juju-core/environs/bootstrap	10.213s
ok  	launchpad.net/juju-core/environs/cloudinit	0.497s
ok  	launchpad.net/juju-core/environs/config	2.622s
ok  	launchpad.net/juju-core/environs/configstore	0.032s
ok  	launchpad.net/juju-core/environs/filestorage	0.028s
ok  	launchpad.net/juju-core/environs/httpstorage	0.699s
ok  	launchpad.net/juju-core/environs/imagemetadata	0.450s
?   	launchpad.net/juju-core/environs/imagemetadata/testing	[no test files]
ok  	launchpad.net/juju-core/environs/instances	0.037s
ok  	launchpad.net/juju-core/environs/jujutest	0.175s
ok  	launchpad.net/juju-core/environs/manual	12.565s
ok  	launchpad.net/juju-core/environs/simplestreams	0.263s
?   	launchpad.net/juju-core/environs/simplestreams/testing	[no test files]
ok  	launchpad.net/juju-core/environs/sshstorage	0.834s
ok  	launchpad.net/juju-core/environs/storage	0.921s
ok  	launchpad.net/juju-core/environs/sync	43.749s
ok  	launchpad.net/juju-core/environs/testing	0.137s
ok  	launchpad.net/juju-core/environs/tools	4.761s
?   	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.019s
?   	launchpad.net/juju-core/instance/testing	[no test files]
ok  	launchpad.net/juju-core/juju	19.104s
ok  	launchpad.net/juju-core/juju/arch	0.014s
ok  	launchpad.net/juju-core/juju/osenv	0.017s
?   	launchpad.net/juju-core/juju/testing	[no test files]
ok  	launchpad.net/juju-core/log	0.012s
ok  	launchpad.net/juju-core/log/syslog	0.030s
?   	launchpad.net/juju-core/log/syslog/testing	[no test files]
ok  	launchpad.net/juju-core/names	0.019s
?   	launchpad.net/juju-core/provider	[no test files]
?   	launchpad.net/juju-core/provider/all	[no test files]
ok  	launchpad.net/juju-core/provider/azure	5.026s
ok  	launchpad.net/juju-core/provider/common	5.219s
ok  	launchpad.net/juju-core/provider/dummy	16.001s
ok  	launchpad.net/juju-core/provider/ec2	15.940s
ok  	launchpad.net/juju-core/provider/joyent	345.866s
ok  	launchpad.net/juju-core/provider/local	15.491s
ok  	launchpad.net/juju-core/provider/maas	12.804s
ok  	launchpad.net/juju-core/provider/manual	1.224s
ok  	launchpad.net/juju-core/provider/openstack	29.059s
ok  	launchpad.net/juju-core/replicaset	61.611s
ok  	launchpad.net/juju-core/rpc	0.074s
ok  	launchpad.net/juju-core/rpc/jsoncodec	0.020s
?   	launchpad.net/juju-core/rpc/rpcreflect	[no test files]
ok  	launchpad.net/juju-core/schema	0.014s
ok  	launchpad.net/juju-core/state	85.655s
ok  	launchpad.net/juju-core/state/api	2.351s
ok  	launchpad.net/juju-core/state/api/agent	2.302s
?   	launchpad.net/juju-core/state/api/base	[no test files]
ok  	launchpad.net/juju-core/state/api/charmrevisionupdater	1.297s
?   	launchpad.net/juju-core/state/api/common	[no test files]
ok  	launchpad.net/juju-core/state/api/deployer	6.218s
ok  	launchpad.net/juju-core/state/api/environment	1.654s
ok  	launchpad.net/juju-core/state/api/firewaller	9.084s
ok  	launchpad.net/juju-core/state/api/keymanager	3.421s
ok  	launchpad.net/juju-core/state/api/keyupdater	2.253s
ok  	launchpad.net/juju-core/state/api/logger	1.848s
ok  	launchpad.net/juju-core/state/api/machiner	4.307s
ok  	launchpad.net/juju-core/state/api/params	0.029s
ok  	launchpad.net/juju-core/state/api/provisioner	9.055s
ok  	launchpad.net/juju-core/state/api/rsyslog	1.629s
?   	launchpad.net/juju-core/state/api/testing	[no test files]
ok  	launchpad.net/juju-core/state/api/uniter	25.356s
ok  	launchpad.net/juju-core/state/api/upgrader	7.672s
ok  	launchpad.net/juju-core/state/api/usermanager	1.724s
ok  	launchpad.net/juju-core/state/api/watcher	2.719s
ok  	launchpad.net/juju-core/state/apiserver	12.504s
ok  	launchpad.net/juju-core/state/apiserver/agent	2.791s
ok  	launchpad.net/juju-core/state/apiserver/charmrevisionupdater	2.378s
?   	launchpad.net/juju-core/state/apiserver/charmrevisionupdater/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/client	45.922s
ok  	launchpad.net/juju-core/state/apiserver/common	2.336s
?   	launchpad.net/juju-core/state/apiserver/common/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/deployer	4.137s
ok  	launchpad.net/juju-core/state/apiserver/environment	1.419s
ok  	launchpad.net/juju-core/state/apiserver/firewaller	5.541s
ok  	launchpad.net/juju-core/state/apiserver/keymanager	4.654s
?   	launchpad.net/juju-core/state/apiserver/keymanager/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/keyupdater	2.769s
ok  	launchpad.net/juju-core/state/apiserver/logger	3.214s
ok  	launchpad.net/juju-core/state/apiserver/machine	2.627s
ok  	launchpad.net/juju-core/state/apiserver/provisioner	13.611s
ok  	launchpad.net/juju-core/state/apiserver/rsyslog	2.573s
?   	launchpad.net/juju-core/state/apiserver/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/uniter	18.034s
ok  	launchpad.net/juju-core/state/apiserver/upgrader	9.563s
ok  	launchpad.net/juju-core/state/apiserver/usermanager	1.826s
ok  	launchpad.net/juju-core/state/multiwatcher	0.629s
ok  	launchpad.net/juju-core/state/presence	6.245s
ok  	launchpad.net/juju-core/state/statecmd	1.647s
?   	launchpad.net/juju-core/state/testing	[no test files]
ok  	launchpad.net/juju-core/state/watcher	5.042s
ok  	launchpad.net/juju-core/store	17.650s
ok  	launchpad.net/juju-core/testing	1.280s
ok  	launchpad.net/juju-core/testing/testbase	0.016s
ok  	launchpad.net/juju-core/thirdparty/pbkdf2	0.124s
ok  	launchpad.net/juju-core/tools	0.020s
ok  	launchpad.net/juju-core/upgrades	8.184s
ok  	launchpad.net/juju-core/upstart	1.042s
ok  	launchpad.net/juju-core/utils	2.071s
ok  	launchpad.net/juju-core/utils/exec	0.029s
ok  	launchpad.net/juju-core/utils/fslock	0.890s
ok  	launchpad.net/juju-core/utils/parallel	0.868s
ok  	launchpad.net/juju-core/utils/set	0.016s
ok  	launchpad.net/juju-core/utils/shell	0.030s
ok  	launchpad.net/juju-core/utils/ssh	22.678s
?   	launchpad.net/juju-core/utils/ssh/testing	[no test files]
ok  	launchpad.net/juju-core/utils/tailer	0.938s
ok  	launchpad.net/juju-core/utils/voyeur	0.014s
ok  	launchpad.net/juju-core/utils/zip	0.083s
ok  	launchpad.net/juju-core/version	0.057s
ok  	launchpad.net/juju-core/worker	16.993s

----------------------------------------------------------------------
FAIL: apiaddressupdater_test.go:69: APIAddressUpdaterSuite.TestAddressChange

[LOG] 26.93330 DEBUG juju.testing tls.Dial(127.0.0.1:51193) failed with dial tcp 127.0.0.1:51193: connection refused
[LOG] 26.93339 DEBUG juju.testing tls.Dial(127.0.0.1:51193) failed with dial tcp 127.0.0.1:51193: connection refused
[LOG] 27.46125 DEBUG juju.environs.configstore Making /tmp/jctest.Yve/gocheck-5577006791947779410/0/home/ubuntu/.juju/environments
[LOG] 27.52745 DEBUG juju.environs.tools reading v1.* tools
[LOG] 27.52748 INFO juju environs/testing: uploading FAKE tools 1.19.0-precise-amd64
[LOG] 27.52916 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 27.52917 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 27.52925 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 27.52928 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.sjson": invalid URL "tools/streams/v1/index.sjson" not found
[LOG] 27.52929 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.json": file "tools/streams/v1/index.json" not found not found
[LOG] 27.52931 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.json": invalid URL "tools/streams/v1/index.json" not found
[LOG] 27.52961 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 27.52965 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 27.52969 DEBUG juju.environs.bootstrap environment "dummyenv" supports service/machine networks: true
[LOG] 27.52970 INFO juju.environs.bootstrap bootstrapping environment "dummyenv"
[LOG] 27.52973 DEBUG juju.environs.bootstrap looking for bootstrap tools: series="precise", arch=<nil>, version=1.19.0
[LOG] 27.52974 INFO juju.environs.tools reading tools with major.minor version 1.19
[LOG] 27.52975 INFO juju.environs.tools filtering tools by version: 1.19.0
[LOG] 27.52976 INFO juju.environs.tools filtering tools by series: precise
[LOG] 27.52977 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 27.52980 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 27.52981 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.sjson": invalid URL "tools/streams/v1/index.sjson" not found
[LOG] 27.52990 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/mirrors.json": file "tools/streams/v1/mirrors.json" not found not found
[LOG] 27.52991 DEBUG juju.environs.simplestreams no mirror index file found
[LOG] 27.52994 DEBUG juju.environs.simplestreams no mirror information available for { }: mirror data for "com.ubuntu.juju:released:tools" not found
[LOG] 27.52995 DEBUG juju.environs.simplestreams read metadata index at "http://127.0.0.1:55270/dummyenv/private/tools/streams/v1/index.json"
[LOG] 27.52999 DEBUG juju.environs.simplestreams candidate matches for products ["com.ubuntu.juju:12.04:amd64" "com.ubuntu.juju:12.04:i386" "com.ubuntu.juju:12.04:arm" "com.ubuntu.juju:12.04:arm64" "com.ubuntu.juju:12.04:ppc64"] are [{Wed, 02 Apr 2014 10:50:48 +0000 products:1.0 content-download  [] streams/v1/com.ubuntu.juju:released:tools.json [com.ubuntu.juju:12.04:amd64]}]
[LOG] 27.53000 DEBUG juju.environs.simplestreams finding products at path "streams/v1/com.ubuntu.juju:released:tools.json"
[LOG] 27.53018 DEBUG juju.environs.simplestreams metadata: &{map[com.ubuntu.juju:12.04:amd64:{ 1.19.0 amd64   map[20140402:0xc200359a80]}] map[] Wed, 02 Apr 2014 10:50:48 +0000 products:1.0 com.ubuntu.juju:released:tools}
[LOG] 27.53024 INFO juju.environs.bootstrap picked newest version: 1.19.0
[LOG] 27.53026 INFO juju.provider.dummy would pick tools from 1.19.0-precise-amd64
[LOG] 27.53056 DEBUG juju.environs.bootstrap putting "provider-state" to bootstrap storage *dummy.dummyStorage
[LOG] 27.53058 INFO juju.state opening state; mongo addresses: ["localhost:51193"]; entity ""
[LOG] 27.53398 INFO juju.state connection established
[LOG] 27.57085 INFO juju.state adding state server info to legacy environment
[LOG] 27.57122 INFO juju.state found existing state servers []
[LOG] 27.58638 INFO juju.state initializing environment
[LOG] 27.61745 INFO juju.state.apiserver listening on "127.0.0.1:54310"
[LOG] 27.63201 INFO juju.state opening state; mongo addresses: ["localhost:51193"]; entity ""
[LOG] 27.63419 INFO juju.state connection established
[LOG] 27.64482 INFO juju juju: authorization error while connecting to state server; retrying
[LOG] 27.64489 INFO juju.state opening state; mongo addresses: ["localhost:51193"]; entity ""
[LOG] 27.64824 INFO juju.state connection established
[LOG] 27.65245 INFO juju.state adding state server info to legacy environment
[LOG] 27.65269 INFO juju.state found existing state servers []
[LOG] 27.69497 INFO juju.state.api dialing "wss://127.0.0.1:54310/"
[LOG] 27.69752 INFO juju.state.apiserver [1] API connection from 127.0.0.1:37400
[LOG] 27.69768 INFO juju.state.api connection established to "wss://127.0.0.1:54310/"
[LOG] 27.69789 DEBUG juju.state.apiserver <- [1] <unknown> {"RequestId":1,"Type":"Admin","Request":"Login","Params":{"AuthTag":"user-admin","Password":"dummy-secret","Nonce":""}}
[LOG] 27.69840 DEBUG juju.state.apiserver hostPorts: []
[LOG] 27.69877 DEBUG juju.state.apiserver -> [1] user-admin 866.413us {"RequestId":1,"Response":{"Servers":[]}} Admin[""].Login
[LOG] 27.74467 INFO juju.state.api dialing "wss://127.0.0.1:54310/"
[LOG] 27.74806 INFO juju.state.apiserver [2] API connection from 127.0.0.1:37402
[LOG] 27.74822 INFO juju.state.api connection established to "wss://127.0.0.1:54310/"
[LOG] 27.74841 DEBUG juju.state.apiserver <- [2] <unknown> {"RequestId":1,"Type":"Admin","Request":"Login","Params":{"AuthTag":"machine-0","Password":"H+ATOJZjIm4AWlkgvMrXY8QR","Nonce":"fake_nonce"}}
[LOG] 27.75600 DEBUG juju.state.apiserver hostPorts: []
[LOG] 27.75604 DEBUG juju.state.apiserver -> [2] machine-0 7.64535ms {"RequestId":1,"Response":{"Servers":[]}} Admin[""].Login
[LOG] 27.75662 DEBUG juju.state.apiserver <- [2] machine-0 {"RequestId":3,"Type":"Machiner","Request":"WatchAPIHostPorts","Params":{}}
[LOG] 27.75802 DEBUG juju.state.apiserver -> [2] machine-0 1.356323ms {"RequestId":3,"Response":{"NotifyWatcherId":"2","Error":null}} Machiner[""].WatchAPIHostPorts
[LOG] 27.75836 DEBUG juju.state.apiserver <- [2] machine-0 {"RequestId":4,"Type":"Machiner","Request":"APIHostPorts","Params":{}}
[LOG] 27.75841 DEBUG juju.state.apiserver <- [2] machine-0 {"RequestId":5,"Type":"NotifyWatcher","Id":"2","Request":"Next","Params":{}}
[LOG] 27.75956 DEBUG juju.state.apiserver -> [2] machine-0 1.155881ms {"RequestId":4,"Response":{"Servers":[[{"Value":"localhost","Type":"hostname","NetworkName":"","NetworkScope":"","Port":1234},{"Value":"127.0.0.1","Type":"ipv4","NetworkName":"","NetworkScope":"","Port":1234}]]}} Machiner[""].APIHostPorts
[LOG] 27.75970 INFO juju.worker.apiaddressupdater API addresses updated to [["localhost" "127.0.0.1"]]
apiaddressupdater_test.go:91:
    c.Assert(servers, gc.HasLen, 0)
... obtained [][]instance.HostPort = [][]instance.HostPort{[]instance.HostPort{instance.HostPort{Address:instance.Address{Value:"localhost", Type:"hostname", NetworkName:"", NetworkScope:""}, Port:1234}, instance.HostPort{Address:instance.Address{Value:"127.0.0.1", Type:"ipv4", NetworkName:"", NetworkScope:""}, Port:1234}}}
... n int = 0

[LOG] 27.76113 DEBUG juju.state.apiserver <- [2] machine-0 {"RequestId":6,"Type":"NotifyWatcher","Id":"2","Request":"Stop","Params":{}}
[LOG] 27.76120 DEBUG juju.state.apiserver -> [2] machine-0 2.784425ms {"RequestId":5,"Error":"watcher has been stopped","ErrorCode":"stopped","Response":{}} NotifyWatcher["2"].Next
[LOG] 27.76126 DEBUG juju.state.apiserver -> [2] machine-0 131.684us {"RequestId":6,"Response":{}} NotifyWatcher["2"].Stop
[LOG] 27.76187 INFO juju.provider.dummy reset environment
[LOG] 27.76208 INFO juju.state.apiserver [1] user-admin API connection terminated after 64.55923ms
[LOG] 27.76295 INFO juju.state.apiserver [2] machine-0 API connection terminated after 14.891057ms
[LOG] 27.77487 INFO juju Reset successfully reset admin password
[LOG] 27.78115 INFO juju Reset successfully reset admin password
[LOG] 27.78447 INFO juju Reset successfully reset admin password
OOPS: 2 passed, 1 FAILED
--- FAIL: TestPackage (1.46 seconds)
FAIL
FAIL	launchpad.net/juju-core/worker/apiaddressupdater	1.658s
ok  	launchpad.net/juju-core/worker/authenticationworker	2.736s
ok  	launchpad.net/juju-core/worker/charmrevisionworker	1.885s
ok  	launchpad.net/juju-core/worker/cleaner	1.202s
ok  	launchpad.net/juju-core/worker/deployer	8.162s
ok  	launchpad.net/juju-core/worker/firewaller	8.368s
ok  	launchpad.net/juju-core/worker/instancepoller	1.496s
ok  	launchpad.net/juju-core/worker/localstorage	0.032s
ok  	launchpad.net/juju-core/worker/logger	1.304s
ok  	launchpad.net/juju-core/worker/machineenvironmentworker	7.342s
ok  	launchpad.net/juju-core/worker/machiner	12.405s
ok  	launchpad.net/juju-core/worker/minunitsworker	1.308s
ok  	launchpad.net/juju-core/worker/peergrouper	1.469s
ok  	launchpad.net/juju-core/worker/provisioner	34.495s
ok  	launchpad.net/juju-core/worker/resumer	1.551s
ok  	launchpad.net/juju-core/worker/rsyslog	3.577s
ok  	launchpad.net/juju-core/worker/terminationworker	0.035s
ok  	launchpad.net/juju-core/worker/uniter	104.797s
ok  	launchpad.net/juju-core/worker/uniter/charm	2.272s
ok  	launchpad.net/juju-core/worker/uniter/debug	0.074s
ok  	launchpad.net/juju-core/worker/uniter/hook	0.015s
ok  	launchpad.net/juju-core/worker/uniter/jujuc	0.405s
ok  	launchpad.net/juju-core/worker/uniter/relation	1.268s
ok  	launchpad.net/juju-core/worker/upgrader	3.082s

warning: building out-of-date packages:
	launchpad.net/goamz/ec2/ec2test
	launchpad.net/goamz/s3/s3test
	github.com/joyent/gomanta/localservices/hook
	github.com/joyent/gomanta/localservices
	github.com/joyent/gomanta/localservices/manta
	github.com/joyent/gosdc/localservices/hook
	github.com/joyent/gosdc/localservices
	github.com/joyent/gosdc/localservices/cloudapi
	launchpad.net/goose/testservices/hook
	launchpad.net/goose/testservices/identityservice
	launchpad.net/goose/testservices
	launchpad.net/goose/testservices/novaservice
	launchpad.net/goose/testservices/swiftservice
	launchpad.net/goose/testservices/openstackservice
installing these packages with 'go test -i ./...' will speed future tests.

mongod: no process found

juju-core

Merge lp:~axwalk/juju-core/lp1300889-disable-mongo-keyfile into lp:~go-bot/juju-core/trunk

Commit message

Description of the change

Preview Diff

Subscribers

1	=== modified file 'agent/mongo/mongo.go'
2	--- agent/mongo/mongo.go 2014-04-01 09:34:43 +0000
3	+++ agent/mongo/mongo.go 2014-04-02 10:11:44 +0000
4	@@ -188,7 +188,8 @@
5	func MongoUpstartService(name, mongodExec, dataDir string, port int) (*upstart.Conf, error) {
6
7	sslKeyFile := path.Join(dataDir, "server.pem")
8	- keyFile := path.Join(dataDir, SharedSecretFile)
9	+ // TODO(Nate): uncomment when we commit HA stuff
10	+ //keyFile := path.Join(dataDir, SharedSecretFile)
11	svc := upstart.NewService(name)
12
13	dbDir := path.Join(dataDir, "db")
14	@@ -210,11 +211,11 @@
15	" --port " + fmt.Sprint(port) +
16	" --noprealloc" +
17	" --syslog" +
18	- " --smallfiles" +
19	- " --keyFile " + utils.ShQuote(keyFile),
20	+ " --smallfiles",
21	// TODO(Nate): uncomment when we commit HA stuff
22	// +
23	- // " --replSet juju",
24	+ // " --replSet juju" +
25	+ // " --keyFile " + utils.ShQuote(keyFile),
26	}
27	return conf, nil
28	}
29
30	=== modified file 'environs/cloudinit/cloudinit_test.go'
31	--- environs/cloudinit/cloudinit_test.go 2014-04-01 08:19:52 +0000
32	+++ environs/cloudinit/cloudinit_test.go 2014-04-02 10:11:44 +0000
33	@@ -142,7 +142,7 @@
34	dd bs=1M count=1 if=/dev/zero of=/var/lib/juju/db/journal/prealloc\.1
35	dd bs=1M count=1 if=/dev/zero of=/var/lib/juju/db/journal/prealloc\.2
36	echo 'Starting MongoDB server \(juju-db\)'.*
37	-cat >> /etc/init/juju-db\.conf << 'EOF'\\ndescription "juju state database"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 65000 65000\\nlimit nproc 20000 20000\\n\\nexec /usr/bin/mongod --auth --dbpath=/var/lib/juju/db --sslOnNormalPorts --sslPEMKeyFile '/var/lib/juju/server\.pem' --sslPEMKeyPassword ignored --bind_ip 0\.0\.0\.0 --port 37017 --noprealloc --syslog --smallfiles --keyFile '/var/lib/juju/shared-secret'\\nEOF\\n
38	+cat >> /etc/init/juju-db\.conf << 'EOF'\\ndescription "juju state database"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 65000 65000\\nlimit nproc 20000 20000\\n\\nexec /usr/bin/mongod --auth --dbpath=/var/lib/juju/db --sslOnNormalPorts --sslPEMKeyFile '/var/lib/juju/server\.pem' --sslPEMKeyPassword ignored --bind_ip 0\.0\.0\.0 --port 37017 --noprealloc --syslog --smallfiles\\nEOF\\n
39	start juju-db
40	mkdir -p '/var/lib/juju/agents/bootstrap'
41	install -m 600 /dev/null '/var/lib/juju/agents/bootstrap/agent\.conf'
42	@@ -236,7 +236,7 @@
43	inexactMatch: true,
44	expectScripts: `
45	echo 'Starting MongoDB server \(juju-db\)'.*
46	-cat >> /etc/init/juju-db\.conf << 'EOF'\\ndescription "juju state database"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 65000 65000\\nlimit nproc 20000 20000\\n\\nexec /usr/lib/juju/bin/mongod --auth --dbpath=/var/lib/juju/db --sslOnNormalPorts --sslPEMKeyFile '/var/lib/juju/server\.pem' --sslPEMKeyPassword ignored --bind_ip 0\.0\.0\.0 --port 37017 --noprealloc --syslog --smallfiles --keyFile '/var/lib/juju/shared-secret'\\nEOF\\n
47	+cat >> /etc/init/juju-db\.conf << 'EOF'\\ndescription "juju state database"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 65000 65000\\nlimit nproc 20000 20000\\n\\nexec /usr/lib/juju/bin/mongod --auth --dbpath=/var/lib/juju/db --sslOnNormalPorts --sslPEMKeyFile '/var/lib/juju/server\.pem' --sslPEMKeyPassword ignored --bind_ip 0\.0\.0\.0 --port 37017 --noprealloc --syslog --smallfiles\\nEOF\\n
48	`,
49	}, {
50	// non state server.