Container Manager Interface

container/lxc/lxc.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package lxc
 
 import (
         "fmt"
         "io/ioutil"
         "os"
         "os/exec"
@@ skipping 94 matching lines @@
         conf.WarnAboutUnused()
         return &containerManager{
                 name:              name,
                 logdir:            logDir,
                 createWithClone:   useClone,
                 useAUFS:           useAUFS,
                 backingFilesystem: backingFS,
         }, nil
 }
 
+func (manager *containerManager) StartContainer(instance instance.Instance) error {
+        name := string(instance.Id())
+        lxcContainer := LxcObjectFactory.New(name)
+        // Create the cloud-init.
+        directory, err := container.NewDirectory(manager.name)

[thumper, 2014/03/26 02:25:57]

wrong name...

should just be "name"

+        if err != nil {
+                return err
+        }
+        // Start the lxc container with the appropriate settings for grabbing the
+        // console output and a log file.
+        consoleFile := filepath.Join(directory, "console.log")
+        //lxcContainer.SetLogFile(filepath.Join(directory, "container.log"), golxc.LogDebug)

[thumper, 2014/03/26 02:25:57]

why did you comment this out?

+        logger.Tracef("start the container")
+        // We explicitly don't pass through the config file to the container.Start
+        // method as we have passed it through at container creation time.  This
+        // is necessary to get the appropriate rootfs reference without explicitly
+        // setting it ourselves.
+        if err = lxcContainer.Start("", consoleFile); err != nil {
+                logger.Errorf("container failed to start: %v", err)
+                return err
+        }
+        return nil
+}
+
+func (manager *containerManager) StopContainer(instance instance.Instance) error {
+        name := string(instance.Id())
+        lxcContainer := LxcObjectFactory.New(name)
+        return lxcContainer.Stop()
+}
+
 func (manager *containerManager) CreateContainer(
         machineConfig *cloudinit.MachineConfig,
         series string,
         network *container.NetworkConfig,
 ) (instance.Instance, *instance.HardwareCharacteristics, error) {
         start := time.Now()
         name := names.MachineTag(machineConfig.MachineId)
         if manager.name != "" {
                 name = fmt.Sprintf("%s-%s", manager.name, name)
         }
@@ skipping 72 matching lines @@
                         return nil, nil, err
                 }
                 logger.Tracef("lxc container created")
         }
         if err := autostartContainer(name); err != nil {
                 return nil, nil, err
         }
         if err := mountHostLogDir(name, manager.logdir); err != nil {
                 return nil, nil, err
         }
-        // Start the lxc container with the appropriate settings for grabbing the
-        // console output and a log file.
-        consoleFile := filepath.Join(directory, "console.log")
-        lxcContainer.SetLogFile(filepath.Join(directory, "container.log"), golxc.LogDebug)
-        logger.Tracef("start the container")
-        // We explicitly don't pass through the config file to the container.Start
-        // method as we have passed it through at container creation time.  This
-        // is necessary to get the appropriate rootfs reference without explicitly
-        // setting it ourselves.
-        if err = lxcContainer.Start("", consoleFile); err != nil {
-                logger.Errorf("container failed to start: %v", err)
-                return nil, nil, err
-        }
+
+        manager.StartContainer(&lxcInstance{lxcContainer, name})

[thumper, 2014/03/26 02:25:57]

don't create a new instance here for the parameter, create it before the
function call, and pass it in, and return the same instance.

+
         arch := version.Current.Arch
         hardware := &instance.HardwareCharacteristics{
                 Arch: &arch,
         }
         logger.Tracef("container %q started: %v", name, time.Now().Sub(start))
         return &lxcInstance{lxcContainer, name}, hardware, nil
 }
 
 func appendToContainerConfig(name, line string) error {
         file, err := os.OpenFile(
@@ skipping 143 matching lines @@
 // Newer versions don't do this, but instead have a config value inside the
 // lxc.conf file.
 func useRestartDir() bool {
         if _, err := os.Stat(LxcRestartDir); err != nil {
                 if os.IsNotExist(err) {
                         return false
                 }
         }
         return true
 }