Merge lp:~thumper/juju-core/fix-lxc-destroy into lp:~go-bot/juju-core/trunk

[Tim Penhey]

Don't try to remove the restart link if we aren't using restart links to restart.

Don't try to remove the restart link if we aren't using restart links to restart.

[Ian Booth (wallyworld)]

Small typo:

"Older version of LXC"....

version needs the s

review: Approve

[Go Bot (go-bot)]

The attempt to merge lp:~thumper/juju-core/fix-lxc-destroy into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 1.316s
ok launchpad.net/juju-core/agent/tools 0.255s
ok launchpad.net/juju-core/bzr 7.544s
ok launchpad.net/juju-core/cert 3.531s
ok launchpad.net/juju-core/charm 0.614s
? 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.052s
ok launchpad.net/juju-core/cloudinit/sshinit 1.014s
ok launchpad.net/juju-core/cmd 0.222s
ok launchpad.net/juju-core/cmd/charm-admin 0.880s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 241.599s
ok launchpad.net/juju-core/cmd/jujud 62.346s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 14.922s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/constraints 0.027s
ok launchpad.net/juju-core/container 0.037s
ok launchpad.net/juju-core/container/factory 0.065s
ok launchpad.net/juju-core/container/kvm 0.290s
ok launchpad.net/juju-core/container/kvm/mock 0.060s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 0.356s
? 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.343s
ok launchpad.net/juju-core/environs 3.339s
ok launchpad.net/juju-core/environs/bootstrap 4.637s
ok launchpad.net/juju-core/environs/cloudinit 0.637s
ok launchpad.net/juju-core/environs/config 3.166s
ok launchpad.net/juju-core/environs/configstore 0.042s
ok launchpad.net/juju-core/environs/filestorage 0.032s
ok launchpad.net/juju-core/environs/httpstorage 0.941s
ok launchpad.net/juju-core/environs/imagemetadata 0.660s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.061s
ok launchpad.net/juju-core/environs/jujutest 0.234s
ok launchpad.net/juju-core/environs/manual 10.738s
ok launchpad.net/juju-core/environs/simplestreams 0.323s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 1.235s
ok launchpad.net/juju-core/environs/storage 1.152s
ok launchpad.net/juju-core/environs/sync 34.858s
ok launchpad.net/juju-core/environs/testing 0.199s
ok launchpad.net/juju-core/environs/tools 7.066s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.016s
ok launchpad.net/juju-core/instance 0.024s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 22.993s
ok launchpad.net/juju-core/juju/osenv 0.021s
? launchpad.net/juju-core/juju/testing [no test files]
ok launchpad.net/juju-core/log 0.016s
ok launchpad.net/juju-core/log/syslog 0.026s
ok launchpad.net/juju-core/names 0.027s
? launchpad.net/juju-core/...

=== modified file 'container/lxc/lxc.go'
--- container/lxc/lxc.go	2014-01-28 04:58:43 +0000
+++ container/lxc/lxc.go	2014-01-30 00:52:25 +0000
@@ -145,10 +145,12 @@
 func (manager *containerManager) StopContainer(instance instance.Instance) error {
 	name := string(instance.Id())
 	lxcContainer := LxcObjectFactory.New(name)
-	// Remove the autostart link.
-	if err := os.Remove(restartSymlink(name)); err != nil {
-		logger.Errorf("failed to remove restart symlink: %v", err)
-		return err
+	if useRestartDir() {
+		// Remove the autostart link.
+		if err := os.Remove(restartSymlink(name)); err != nil {
+			logger.Errorf("failed to remove restart symlink: %v", err)
+			return err
+		}
 	}
 	if err := lxcContainer.Destroy(); err != nil {
 		logger.Errorf("failed to destroy lxc container: %v", err)
@@ -236,3 +238,18 @@
 	}
 	return configFilename, nil
 }
+
+// useRestartDir is used to determine whether or not to use a symlink to the
+// container config as the restart mechanism.  Older versions of LXC had the
+// /etc/lxc/auto directory that would indicate that a container shoud auto-
+// restart when the machine boots by having a symlink to the lxc.conf file.
+// 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
+}

=== modified file 'container/lxc/lxc_test.go'
--- container/lxc/lxc_test.go	2014-01-28 04:58:43 +0000
+++ container/lxc/lxc_test.go	2014-01-30 00:52:25 +0000
@@ -215,6 +215,16 @@
 	c.Assert(autostartLink, jc.SymlinkDoesNotExist)
 }
 
+func (s *LxcSuite) TestStopContainerNoRestartDir(c *gc.C) {
+	err := os.Remove(s.RestartDir)
+	c.Assert(err, gc.IsNil)
+
+	manager := lxc.NewContainerManager(container.ManagerConfig{})
+	instance := containertesting.StartContainer(c, manager, "1/lxc/0")
+	err = manager.StopContainer(instance)
+	c.Assert(err, gc.IsNil)
+}
+
 type NetworkSuite struct {
 	testbase.LoggingSuite
 }

=== removed file 'container/lxc/restart.go'
--- container/lxc/restart.go	2014-01-26 22:51:43 +0000
+++ container/lxc/restart.go	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-package lxc
-
-import (
-	"os"
-)
-
-//If restart dir exists, return true. Otherwise, return false.
-//TODO Should this test LXC version, not existence of restart dir?
-func useRestartDir() bool {
-	if _, err := os.Stat(LxcRestartDir); err != nil {
-		if os.IsNotExist(err) {
-			return false
-		}
-	}
-	return true
-}