cmd/jujud: remove mongo and data-dir on teardown

environs/cloudinit/cloudinit.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package cloudinit
 
 import (
         "encoding/base64"
         "encoding/json"
         "fmt"
         "path"
@@ skipping 290 matching lines @@
         })
 }
 
 // addAgentInfo adds agent-required information to the agent's directory
 // and returns the agent directory name.
 func (cfg *MachineConfig) addAgentInfo(c *cloudinit.Config, tag string) (agent.Config, error) {
         acfg, err := cfg.agentConfig(tag)
         if err != nil {
                 return nil, err
         }
+        acfg.SetValue(agent.AgentServiceName, machineAgentServiceName(tag))
+        if cfg.StateServer {
+                acfg.SetValue(agent.MongoServiceName, mongoServiceName)

[rog, 2013/11/19 09:50:39]

Is there nowhere to test this functionality?

[axw, 2013/11/19 10:23:10]

Gah, I intended to do that, it just slipped my mind. Added a test.

+        }
         cmds, err := acfg.WriteCommands()
         if err != nil {
                 return nil, err
         }
         c.AddScripts(cmds...)
         return acfg, nil
 }
 
+const mongoServiceName = "juju-db"
+
+func machineAgentServiceName(tag string) string {
+        return "jujud-" + tag
+}
+
 func (cfg *MachineConfig) addMachineAgentToBoot(c *cloudinit.Config, tag, machineId string) error {
         // Make the agent run via a symbolic link to the actual tools
         // directory, so it can upgrade itself without needing to change
         // the upstart script.
         toolsDir := agenttools.ToolsDir(cfg.DataDir, tag)
         // TODO(dfc) ln -nfs, so it doesn't fail if for some reason that the target already exists
         c.AddScripts(fmt.Sprintf("ln -s %v %s", cfg.Tools.Version, shquote(toolsDir)))
 
-        name := "jujud-" + tag
+        name := machineAgentServiceName(tag)
         conf := upstart.MachineAgentUpstartService(name, toolsDir, cfg.DataDir, "/var/log/juju/", tag, machineId, nil)
         cmds, err := conf.InstallCommands()
         if err != nil {
                 return fmt.Errorf("cannot make cloud-init upstart script for the %s agent: %v", tag, err)
         }
         c.AddScripts(cmds...)
         return nil
 }
 
 func (cfg *MachineConfig) addMongoToBoot(c *cloudinit.Config) error {
         dbDir := path.Join(cfg.DataDir, "db")
         c.AddScripts(
                 "mkdir -p "+dbDir+"/journal",
                 "chmod 0700 "+dbDir,
                 // Otherwise we get three files with 100M+ each, which takes time.
                 "dd bs=1M count=1 if=/dev/zero of="+dbDir+"/journal/prealloc.0",
                 "dd bs=1M count=1 if=/dev/zero of="+dbDir+"/journal/prealloc.1",
                 "dd bs=1M count=1 if=/dev/zero of="+dbDir+"/journal/prealloc.2",
         )
 
-        conf := upstart.MongoUpstartService("juju-db", cfg.DataDir, dbDir, cfg.StatePort)
+        name := mongoServiceName
+        conf := upstart.MongoUpstartService(name, cfg.DataDir, dbDir, cfg.StatePort)
         cmds, err := conf.InstallCommands()
         if err != nil {
                 return fmt.Errorf("cannot make cloud-init upstart script for the state database: %v", err)
         }
         c.AddScripts(cmds...)
         return nil
 }
 
 // versionDir converts a tools URL into a name
 // to use as a directory for storing the tools executables in
@@ skipping 172 matching lines @@
                 }
                 if cfg.APIInfo.Tag != names.MachineTag(cfg.MachineId) {
                         return fmt.Errorf("entity tag must match started machine")
                 }
         }
         if cfg.MachineNonce == "" {
                 return fmt.Errorf("missing machine nonce")
         }
         return nil
 }