1
=== modified file 'container/lxc/export_test.go'
2
--- container/lxc/export_test.go	2014-03-07 02:44:39 +0000
3
+++ container/lxc/export_test.go	2014-03-12 01:28:37 +0000
4
@@ -4,8 +4,9 @@
5
4
package lxc
4
package lxc
6
5
5
7
6
var (
6
var (
8
7
	ContainerConfigFilename = containerConfigFilename
9
8
	ContainerDirFilesystem  = containerDirFilesystem
10
9
	GenerateNetworkConfig   = generateNetworkConfig
11
7
	NetworkConfigTemplate   = networkConfigTemplate
10
	NetworkConfigTemplate   = networkConfigTemplate
12
8
	GenerateNetworkConfig   = generateNetworkConfig
13
9
	RestartSymlink          = restartSymlink
11
	RestartSymlink          = restartSymlink
14
10
	ContainerConfigFilename = containerConfigFilename
15
11
)
12
)
16
12
13
17
=== modified file 'container/lxc/lxc.go'
18
--- container/lxc/lxc.go	2014-03-11 03:08:17 +0000
19
+++ container/lxc/lxc.go	2014-03-12 01:28:37 +0000
20
@@ -7,6 +7,7 @@
21
7
	"fmt"
7
	"fmt"
22
8
	"io/ioutil"
8
	"io/ioutil"
23
9
	"os"
9
	"os"
24
10
	"os/exec"
25
10
	"path/filepath"
11
	"path/filepath"
26
11
	"strings"
12
	"strings"
27
12
13
28
@@ -33,6 +34,8 @@
29
33
const (
34
const (
30
34
	// DefaultLxcBridge is the package created container bridge
35
	// DefaultLxcBridge is the package created container bridge
31
35
	DefaultLxcBridge = "lxcbr0"
36
	DefaultLxcBridge = "lxcbr0"
32
37
	// Btrfs is special as we treat it differently for create and clone.
33
38
	Btrfs = "btrfs"
34
36
)
39
)
35
37
40
36
38
// DefaultNetworkConfig returns a valid NetworkConfig to use the
41
// DefaultNetworkConfig returns a valid NetworkConfig to use the
37
@@ -41,9 +44,29 @@
38
41
	return container.BridgeNetworkConfig(DefaultLxcBridge)
44
	return container.BridgeNetworkConfig(DefaultLxcBridge)
39
42
}
45
}
40
43
46
41
47
// FsCommandOutput calls cmd.Output, this is used as an overloading point so
42
48
// we can test what *would* be run without actually executing another program
43
49
var FsCommandOutput = (*exec.Cmd).CombinedOutput
44
50
45
51
func containerDirFilesystem() (string, error) {
46
52
	cmd := exec.Command("df", "--output=fstype", LxcContainerDir)
47
53
	out, err := FsCommandOutput(cmd)
48
54
	if err != nil {
49
55
		return "", err
50
56
	}
51
57
	// The filesystem is the second line.
52
58
	lines := strings.Split(string(out), "\n")
53
59
	if len(lines) < 2 {
54
60
		logger.Errorf("unexpected output: ", out)
55
61
		return "", fmt.Errorf("could not determine filesystem type")
56
62
	}
57
63
	return lines[1], nil
58
64
}
59
65
60
44
type containerManager struct {
66
type containerManager struct {
63
45
	name   string
67
	name              string
64
46
	logdir string
68
	logdir            string
65
69
	backingFilesystem string
66
47
}
70
}
67
48
71
68
49
// containerManager implements container.Manager.
72
// containerManager implements container.Manager.
69
@@ -63,11 +86,23 @@
70
63
	if logDir == "" {
86
	if logDir == "" {
71
64
		logDir = agent.DefaultLogDir
87
		logDir = agent.DefaultLogDir
72
65
	}
88
	}
73
89
	backingFS, err := containerDirFilesystem()
74
90
	if err != nil {
75
91
		// Especially in tests, or a bot, the lxc dir may not exist
76
92
		// causing the test to fail. Since we only really care if the
77
93
		// backingFS is 'btrfs' and we treat the rest the same, just
78
94
		// call it 'unknown'.
79
95
		backingFS = "unknown"
80
96
	}
81
97
	logger.Tracef("backing filesystem: %q", backingFS)
82
66
	for k, v := range conf {
98
	for k, v := range conf {
83
67
		logger.Warningf(`Found unused config option with key: "%v" and value: "%v"`, k, v)
99
		logger.Warningf(`Found unused config option with key: "%v" and value: "%v"`, k, v)
84
68
	}
100
	}
87
69
101
	return &containerManager{
88
70
	return &containerManager{name: name, logdir: logDir}, nil
102
		name:              name,
89
103
		logdir:            logDir,
90
104
		backingFilesystem: backingFS,
91
105
	}, nil
92
71
}
106
}
93
72
107
94
73
func (manager *containerManager) StartContainer(
108
func (manager *containerManager) StartContainer(
95
74
109
96
=== modified file 'container/lxc/lxc_test.go'
97
--- container/lxc/lxc_test.go	2014-03-11 03:08:17 +0000
98
+++ container/lxc/lxc_test.go	2014-03-12 01:28:37 +0000
99
@@ -41,6 +41,37 @@
100
41
	loggo.GetLogger("juju.container.lxc").SetLogLevel(loggo.TRACE)
41
	loggo.GetLogger("juju.container.lxc").SetLogLevel(loggo.TRACE)
101
42
}
42
}
102
43
43
103
44
func (s *LxcSuite) TestContainerDirFilesystem(c *gc.C) {
104
45
	for i, test := range []struct {
105
46
		message    string
106
47
		output     string
107
48
		expected   string
108
49
		errorMatch string
109
50
	}{{
110
51
		message:  "btrfs",
111
52
		output:   "Type\nbtrfs\n",
112
53
		expected: lxc.Btrfs,
113
54
	}, {
114
55
		message:  "ext4",
115
56
		output:   "Type\next4\n",
116
57
		expected: "ext4",
117
58
	}, {
118
59
		message:    "not enough output",
119
60
		output:     "foo",
120
61
		errorMatch: "could not determine filesystem type",
121
62
	}} {
122
63
		c.Logf("%v: %s", i, test.message)
123
64
		s.HookCommandOutput(&lxc.FsCommandOutput, []byte(test.output), nil)
124
65
		value, err := lxc.ContainerDirFilesystem()
125
66
		if test.errorMatch == "" {
126
67
			c.Check(err, gc.IsNil)
127
68
			c.Check(value, gc.Equals, test.expected)
128
69
		} else {
129
70
			c.Check(err, gc.ErrorMatches, test.errorMatch)
130
71
		}
131
72
	}
132
73
}
133
74
134
44
func (s *LxcSuite) makeManager(c *gc.C, name string) container.Manager {
75
func (s *LxcSuite) makeManager(c *gc.C, name string) container.Manager {
135
45
	manager, err := lxc.NewContainerManager(container.ManagerConfig{
76
	manager, err := lxc.NewContainerManager(container.ManagerConfig{
136
46
		container.ConfigName: name,
77
		container.ConfigName: name,
137
@@ -55,7 +86,7 @@
138
55
		"shazam":             "Captain Marvel",
86
		"shazam":             "Captain Marvel",
139
56
	})
87
	})
140
57
	c.Assert(err, gc.IsNil)
88
	c.Assert(err, gc.IsNil)
142
58
	c.Assert(c.GetTestLog(), gc.Matches, `^.*WARNING juju.container.lxc Found unused config option with key: "shazam" and value: "Captain Marvel"\n*`)
89
	c.Assert(c.GetTestLog(), jc.Contains, `WARNING juju.container.lxc Found unused config option with key: "shazam" and value: "Captain Marvel"`)
143
59
}
90
}
144
60
91
145
61
func (s *LxcSuite) TestStartContainer(c *gc.C) {
92
func (s *LxcSuite) TestStartContainer(c *gc.C) {
Status:	Merged
Approved by:	John A Meinel on 2014-03-12
Approved revision:	no longer in the source branch.
Merged at revision:	2408
Proposed branch:	lp:~thumper/juju-core/container-dir-filesystem-type
Merge into:	lp:~go-bot/juju-core/trunk
Prerequisite:	lp:~thumper/juju-core/autostart-containers-after-creation
Diff against target:	145 lines (+74/-7) 3 files modified container/lxc/export_test.go (+3/-2) container/lxc/lxc.go (+39/-4) container/lxc/lxc_test.go (+32/-1)
To merge this branch:	bzr merge lp:~thumper/juju-core/container-dir-filesystem-type
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2014-03-09	Pending
Review via email: mp+210101@code.launchpad.net