Fix mongo set up so it works with ha

Author: wallyworld

cmd/jujud/agent/machine.go

@@ -1167,79 +1167,36 @@ func (a *MachineAgent) ensureMongoServer(agentConfig agent.Config) (err error) {
 		}
 	}()
 
-	// Many of the steps here, such as adding the controller to the
-	// admin DB and initiating the replicaset, are once-only actions,
-	// required when upgrading from a pre-HA-capable
-	// environment. These calls won't do anything if the thing they
-	// need to set up has already been done.
-	var needReplicasetInit = false
-	var machineAddrs []network.Address
-
 	mongoInstalled, err := mongo.IsServiceInstalled()
 	if err != nil {
 		return errors.Annotate(err, "error while checking if mongodb service is installed")
 	}
 
-	if mongoInstalled {
-		logger.Debugf("mongodb service is installed")
-
-		if _, err := a.ensureMongoAdminUser(agentConfig); err != nil {
-			return errors.Trace(err)
-		}
-
-		if err := a.ensureMongoSharedSecret(agentConfig); err != nil {
-			return errors.Trace(err)
-		}
-		agentConfig = a.CurrentConfig() // ensureMongoSharedSecret may have updated the config
-
-		mongoInfo, ok := agentConfig.MongoInfo()
-		if !ok {
-			return errors.New("unable to retrieve mongo info to check replicaset")
-		}
-
-		needReplicasetInit, err = isReplicasetInitNeeded(mongoInfo)
+	if !mongoInstalled {
+		// EnsureMongoServer installs/upgrades the init config as necessary.
+		ensureServerParams, err := cmdutil.NewEnsureServerParams(agentConfig)
 		if err != nil {
-			return errors.Annotate(err, "error while checking replicaset")
+			return err
 		}
-
-		// If the replicaset is to be initialised the machine addresses
-		// need to be retrieved *before* MongoDB is restarted with the
-		// --replset option (in EnsureMongoServer). Once MongoDB is
-		// started with --replset it won't respond to queries until the
-		// replicaset is initiated.
-		if needReplicasetInit {
-			logger.Infof("replicaset not yet configured")
-			machineAddrs, err = getMachineAddresses(agentConfig)
-			if err != nil {
-				return errors.Trace(err)
-			}
+		if err := cmdutil.EnsureMongoServer(ensureServerParams); err != nil {
+			return err
 		}
 	}
+	logger.Debugf("mongodb service is installed")
 
-	// EnsureMongoServer installs/upgrades the init config as necessary.
-	ensureServerParams, err := cmdutil.NewEnsureServerParams(agentConfig)
+	// Mongo is installed, record the version.
+	err = a.ChangeConfig(func(config agent.ConfigSetter) error {
+		config.SetMongoVersion(mongo.InstalledVersion())
+		return nil
+	})
 	if err != nil {
-		return err
-	}
-	if err := cmdutil.EnsureMongoServer(ensureServerParams); err != nil {
-		return err
+		return errors.Annotate(err, "cannot set mongo version")
 	}
+	agentConfig = a.CurrentConfig()
 
-	// Initiate the replicaset if required.
-	if needReplicasetInit {
-		servingInfo, ok := agentConfig.StateServingInfo()
-		if !ok {
-			return stateWorkerServingConfigErr
-		}
-		mongoInfo, ok := agentConfig.MongoInfo()
-		if !ok {
-			return errors.New("unable to retrieve mongo info to initiate replicaset")
-		}
-		if err := initiateReplicaSet(mongoInfo, servingInfo.StatePort, machineAddrs); err != nil {
-			return err
-		}
+	if _, err := a.ensureMongoAdminUser(agentConfig); err != nil {
+		return errors.Trace(err)
 	}
-
 	return nil
 }
 
@@ -1269,119 +1226,6 @@ func (a *MachineAgent) ensureMongoAdminUser(agentConfig agent.Config) (added boo
 	})
 }
 
-// ensureMongoSharedSecret generates a MongoDB shared secret if
-// required, updating the agent's config and state.
-func (a *MachineAgent) ensureMongoSharedSecret(agentConfig agent.Config) error {
-	servingInfo, ok := agentConfig.StateServingInfo()
-	if !ok {
-		return stateWorkerServingConfigErr
-	}
-
-	if servingInfo.SharedSecret != "" {
-		return nil // Already done
-	}
-
-	logger.Infof("state serving info has no shared secret - generating")
-
-	var err error
-	servingInfo.SharedSecret, err = mongo.GenerateSharedSecret()
-	if err != nil {
-		return err
-	}
-	logger.Debugf("updating state serving info in agent config")
-	if err = a.ChangeConfig(func(config agent.ConfigSetter) error {
-		config.SetStateServingInfo(servingInfo)
-		return nil
-	}); err != nil {
-		return err
-	}
-	agentConfig = a.CurrentConfig()
-
-	logger.Debugf("updating state serving info in state")
-
-	// Note: we set Direct=true in the mongo options because it's
-	// possible that we've previously upgraded the mongo server's
-	// configuration to form a replicaset, but failed to initiate it.
-	dialOpts := mongo.DefaultDialOpts()
-	dialOpts.Direct = true
-	st, _, err := openState(agentConfig, dialOpts)
-	if err != nil {
-		return err
-	}
-	defer st.Close()
-
-	ssi := cmdutil.ParamsStateServingInfoToStateStateServingInfo(servingInfo)
-	if err := st.SetStateServingInfo(ssi); err != nil {
-		return errors.Errorf("cannot set state serving info: %v", err)
-	}
-
-	logger.Infof("shared secret updated in state serving info")
-	return nil
-}
-
-// isReplicasetInitNeeded returns true if the replicaset needs to be
-// initiated.
-func isReplicasetInitNeeded(mongoInfo *mongo.MongoInfo) (bool, error) {
-	dialInfo, err := mongo.DialInfo(mongoInfo.Info, mongo.DefaultDialOpts())
-	if err != nil {
-		return false, errors.Annotate(err, "cannot generate dial info to check replicaset")
-	}
-	dialInfo.Username = mongoInfo.Tag.String()
-	dialInfo.Password = mongoInfo.Password
-
-	session, err := mgo.DialWithInfo(dialInfo)
-	if err != nil {
-		return false, errors.Annotate(err, "cannot dial mongo to check replicaset")
-	}
-	defer session.Close()
-
-	cfg, err := replicaset.CurrentConfig(session)
-	if err != nil {
-		logger.Debugf("couldn't retrieve replicaset config (not fatal): %v", err)
-		return true, nil
-	}
-	numMembers := len(cfg.Members)
-	logger.Debugf("replicaset member count: %d", numMembers)
-	return numMembers < 1, nil
-}
-
-// getMachineAddresses connects to state to determine the machine's
-// network addresses.
-func getMachineAddresses(agentConfig agent.Config) ([]network.Address, error) {
-	logger.Debugf("opening state to get machine addresses")
-	dialOpts := mongo.DefaultDialOpts()
-	dialOpts.Direct = true
-	st, m, err := openState(agentConfig, dialOpts)
-	if err != nil {
-		return nil, errors.Annotate(err, "failed to open state to retrieve machine addresses")
-	}
-	defer st.Close()
-	return m.Addresses(), nil
-}
-
-// initiateReplicaSet connects to MongoDB and sets up the replicaset.
-func initiateReplicaSet(mongoInfo *mongo.MongoInfo, statePort int, machineAddrs []network.Address) error {
-	peerAddr := mongo.SelectPeerAddress(machineAddrs)
-	if peerAddr == "" {
-		return errors.Errorf("no appropriate peer address found in %q", machineAddrs)
-	}
-
-	dialInfo, err := mongo.DialInfo(mongoInfo.Info, mongo.DefaultDialOpts())
-	if err != nil {
-		return errors.Annotate(err, "cannot generate dial info to initiate replicaset")
-	}
-
-	if err := maybeInitiateMongoServer(peergrouper.InitiateMongoParams{
-		DialInfo:       dialInfo,
-		MemberHostPort: net.JoinHostPort(peerAddr, fmt.Sprint(statePort)),
-		User:           mongoInfo.Tag.String(), // TODO(dfc) InitiateMongoParams should take a Tag
-		Password:       mongoInfo.Password,
-	}); err != nil && err != peergrouper.ErrReplicaSetAlreadyInitiated {
-		return err
-	}
-	return nil
-}
-
 func openState(agentConfig agent.Config, dialOpts mongo.DialOpts) (_ *state.State, _ *state.Machine, err error) {
 	info, ok := agentConfig.MongoInfo()
 	if !ok {

cmd/jujud/agent/machine_test.go

@@ -1532,8 +1532,6 @@ func (s *MachineSuite) TestMachineAgentUpgradeMongo(c *gc.C) {
 		c.Fatalf("state not opened")
 	}
 	s.waitStopped(c, state.JobManageModel, a, done)
-	c.Assert(s.fakeEnsureMongo.EnsureCount, gc.Equals, 1)
-	c.Assert(s.fakeEnsureMongo.InitiateCount, gc.Equals, 1)
 }
 
 func (s *MachineSuite) TestMachineAgentSetsPrepareRestore(c *gc.C) {
@@ -1741,42 +1739,6 @@ func (s *MachineSuite) setUpNewModel(c *gc.C) (newSt *state.State, closer func()
 	}
 }
 
-func (s *MachineSuite) TestReplicasetInitiation(c *gc.C) {
-	if runtime.GOOS == "windows" {
-		c.Skip("controllers on windows aren't supported")
-	}
-
-	s.fakeEnsureMongo.ReplicasetInitiated = false
-
-	m, _, _ := s.primeAgent(c, state.JobManageModel)
-	a := s.newAgent(c, m)
-	agentConfig := a.CurrentConfig()
-
-	err := a.ensureMongoServer(agentConfig)
-	c.Assert(err, jc.ErrorIsNil)
-
-	c.Assert(s.fakeEnsureMongo.EnsureCount, gc.Equals, 1)
-	c.Assert(s.fakeEnsureMongo.InitiateCount, gc.Equals, 1)
-}
-
-func (s *MachineSuite) TestReplicasetAlreadyInitiated(c *gc.C) {
-	if runtime.GOOS == "windows" {
-		c.Skip("controllers on windows aren't supported")
-	}
-
-	s.fakeEnsureMongo.ReplicasetInitiated = true
-
-	m, _, _ := s.primeAgent(c, state.JobManageModel)
-	a := s.newAgent(c, m)
-	agentConfig := a.CurrentConfig()
-
-	err := a.ensureMongoServer(agentConfig)
-	c.Assert(err, jc.ErrorIsNil)
-
-	c.Assert(s.fakeEnsureMongo.EnsureCount, gc.Equals, 1)
-	c.Assert(s.fakeEnsureMongo.InitiateCount, gc.Equals, 0)
-}
-
 func (s *MachineSuite) TestReplicasetInitForNewController(c *gc.C) {
 	if runtime.GOOS == "windows" {
 		c.Skip("controllers on windows aren't supported")

cmd/jujud/bootstrap.go

@@ -225,20 +225,6 @@ func (c *BootstrapCommand) Run(_ *cmd.Context) error {
 		return fmt.Errorf("cannot write agent config: %v", err)
 	}
 
-	err = c.ChangeConfig(func(config agent.ConfigSetter) error {
-		// We'll try for mongo 3.2 first and fallback to
-		// mongo 2.4 if the newer binaries are not available.
-		if mongo.BinariesAvailable(mongo.Mongo32wt) {
-			config.SetMongoVersion(mongo.Mongo32wt)
-		} else {
-			config.SetMongoVersion(mongo.Mongo24)
-		}
-		return nil
-	})
-	if err != nil {
-		return errors.Annotate(err, "cannot set mongo version")
-	}
-
 	agentConfig = c.CurrentConfig()
 
 	// Create system-identity file

cmd/jujud/util/util.go

@@ -193,8 +193,6 @@ func NewEnsureServerParams(agentConfig agent.Config) (mongo.EnsureServerParams,
 		DataDir:              agentConfig.DataDir(),
 		OplogSize:            oplogSize,
 		SetNumaControlPolicy: numaCtlPolicy,
-
-		Version: agentConfig.MongoVersion(),
 	}
 	return params, nil
 }

mongo/mongo.go

@@ -193,9 +193,20 @@ var (
 	}
 )
 
-// BinariesAvailable returns true if the binaries for the
+// InstalledVersion returns the version of mongo installed.
+// We look for a specific, known version supported by this Juju,
+// and fall back to the original mongo 2.4.
+func InstalledVersion() Version {
+	mgoVersion := Mongo24
+	if binariesAvailable(Mongo32wt) {
+		mgoVersion = Mongo32wt
+	}
+	return mgoVersion
+}
+
+// binariesAvailable returns true if the binaries for the
 // given Version of mongo are available.
-func BinariesAvailable(v Version) bool {
+func binariesAvailable(v Version) bool {
 	var path string
 	switch v {
 	case Mongo24:
@@ -362,9 +373,6 @@ type EnsureServerParams struct {
 	// SetNumaControlPolicy preference - whether the user
 	// wants to set the numa control policy when starting mongo.
 	SetNumaControlPolicy bool
-
-	// Version is the mongod version to be used.
-	Version Version
 }
 
 // EnsureServer ensures that the MongoDB server is installed,
@@ -400,7 +408,8 @@ func EnsureServer(args EnsureServerParams) error {
 		// (LP #1441904)
 		logger.Errorf("cannot install/upgrade mongod (will proceed anyway): %v", err)
 	}
-	mongoPath, err := Path(args.Version)
+	mgoVersion := InstalledVersion()
+	mongoPath, err := Path(mgoVersion)
 	if err != nil {
 		return err
 	}
@@ -429,7 +438,7 @@ func EnsureServer(args EnsureServerParams) error {
 		}
 	}
 
-	svcConf := newConf(args.DataDir, dbDir, mongoPath, args.StatePort, oplogSizeMB, args.SetNumaControlPolicy, args.Version, true)
+	svcConf := newConf(args.DataDir, dbDir, mongoPath, args.StatePort, oplogSizeMB, args.SetNumaControlPolicy, mgoVersion, true)
 	svc, err := newService(ServiceName, svcConf)
 	if err != nil {
 		return err
@@ -524,16 +533,6 @@ func installMongod(operatingsystem string, numaCtl bool) error {
 		return err
 	}
 
-	// Only Quantal requires the PPA.
-	if operatingsystem == "quantal" {
-		// install python-software-properties:
-		if err := pacman.InstallPrerequisite(); err != nil {
-			return err
-		}
-		if err := pacman.AddRepository("ppa:juju/stable"); err != nil {
-			return err
-		}
-	}
 	// CentOS requires "epel-release" for the epel repo mongodb-server is in.
 	if operatingsystem == "centos7" {
 		// install epel-release