Merge lp://staging/~mfoord/juju-core/slow-replset into lp://staging/~go-bot/juju-core/trunk

Reviewers: mp+221709_code.launchpad.net,

Message:
Please take a look.

Description:
replicaset/initiate: wait for config from initiate

After replica set initiation wait (briefly) for a
config check to return successfully. Hopefully this
will fix the problems with bootstrap on precise for
slow machines.

https://code.launchpad.net/~mfoord/juju-core/slow-replset/+merge/221709

(do not edit description out of merge proposal)

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

Affected files (+19, -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-20140602083040-w9o6gm2nvydmo7u1
+New revision: <email address hidden>

Index: replicaset/replicaset.go
=== modified file 'replicaset/replicaset.go'
--- replicaset/replicaset.go 2014-05-30 00:31:44 +0000
+++ replicaset/replicaset.go 2014-06-02 11:18:12 +0000
@@ -23,6 +23,10 @@
   // attempts to replSetInitiate.
   initiateAttemptDelay = 100 * time.Millisecond

+ // initiateConfigDelay is the amount of time to sleep between failed
+ // attempts to get the replicaset config after initiate
+ initiateConfigDelay = 500 * time.Millisecond
+
   // rsMembersUnreachableError is the error message returned from mongo
   // when it thinks that replicaset members are unreachable. This can
   // occur if replSetInitiate is executed shortly after starting up mongo.
@@ -64,6 +68,19 @@
    }
    break
   }
+
+ var config *Config
+ for i := 0; i < maxInitiateAttempts; i++ {
+ config, err = CurrentConfig(monotonicSession)
+ if err != nil {
+ logger.Warningf("Initiate: fetching config failed: %v", err)
+ }
+ if err != nil || len(config.Members) == 0 {
+ time.Sleep(initiateConfigDelay)
+ continue
+ }
+ break
+ }
   return err
  }

https://codereview.appspot.com/104800043/diff/1/replicaset/replicaset.go
File replicaset/replicaset.go (right):

https://codereview.appspot.com/104800043/diff/1/replicaset/replicaset.go#newcode74
replicaset/replicaset.go:74: config, err =
CurrentConfig(monotonicSession)
I am strongly inclined to suggest mocking CurrentConfig for ease of
testing this...

https://codereview.appspot.com/104800043/

Please take a look.

https://codereview.appspot.com/104800043/

Please take a look.

https://codereview.appspot.com/104800043/

LGTM

https://codereview.appspot.com/104800043/