1
=== modified file 'provider/local/environ.go'
2
--- provider/local/environ.go	2014-03-07 15:56:55 +0000
3
+++ provider/local/environ.go	2014-03-11 01:19:21 +0000
4
@@ -1,4 +1,4 @@
6
1
// Copyright 2013 Canonical Ltd.
1
// Copyright 2013, 2014 Canonical Ltd.
7
2
// Licensed under the AGPLv3, see LICENCE file for details.
2
// Licensed under the AGPLv3, see LICENCE file for details.
8
3
3
9
4
package local
4
package local
10
@@ -60,6 +60,7 @@
11
60
	localStorage     storage.Storage
60
	localStorage     storage.Storage
12
61
	storageListener  net.Listener
61
	storageListener  net.Listener
13
62
	containerManager container.Manager
62
	containerManager container.Manager
14
63
	fastLXC          bool
15
63
}
64
}
16
64
65
17
65
// GetToolsSources returns a list of sources which are used to search for simplestreams tools metadata.
66
// GetToolsSources returns a list of sources which are used to search for simplestreams tools metadata.
18
@@ -210,9 +211,11 @@
19
210
	defer env.localMutex.Unlock()
211
	defer env.localMutex.Unlock()
20
211
	env.config = ecfg
212
	env.config = ecfg
21
212
	env.name = ecfg.Name()
213
	env.name = ecfg.Name()
22
214
	containerType := ecfg.container()
23
215
	env.fastLXC = useFastLXC(containerType)
24
213
216
25
214
	env.containerManager, err = factory.NewContainerManager(
217
	env.containerManager, err = factory.NewContainerManager(
27
215
		ecfg.container(),
218
		containerType,
28
216
		container.ManagerConfig{
219
		container.ManagerConfig{
29
217
			container.ConfigName:   env.config.namespace(),
220
			container.ConfigName:   env.config.namespace(),
30
218
			container.ConfigLogDir: env.config.logDir(),
221
			container.ConfigLogDir: env.config.logDir(),
31
219
222
32
=== modified file 'provider/local/export_test.go'
33
--- provider/local/export_test.go	2014-02-14 04:26:21 +0000
34
+++ provider/local/export_test.go	2014-03-11 01:19:21 +0000
35
@@ -10,11 +10,14 @@
36
10
)
10
)
37
11
11
38
12
var (
12
var (
44
13
	Provider         = providerInstance
13
	CheckLocalPort         = &checkLocalPort
45
14
	FinishBootstrap  = &finishBootstrap
14
	DetectAptProxies       = &detectAptProxies
46
15
	CheckLocalPort   = &checkLocalPort
15
	EnvKeyTestingForceSlow = envKeyTestingForceSlow
47
16
	DetectAptProxies = &detectAptProxies
16
	FinishBootstrap        = &finishBootstrap
48
17
	UserCurrent      = &userCurrent
17
	Provider               = providerInstance
49
18
	ReleaseVersion         = &releaseVersion
50
19
	UseFastLXC             = useFastLXC
51
20
	UserCurrent            = &userCurrent
52
18
)
21
)
53
19
22
54
20
// SetRootCheckFunction allows tests to override the check for a root user.
23
// SetRootCheckFunction allows tests to override the check for a root user.
55
21
24
56
=== added file 'provider/local/lxc.go'
57
--- provider/local/lxc.go	1970-01-01 00:00:00 +0000
58
+++ provider/local/lxc.go	2014-03-11 01:19:21 +0000
59
@@ -0,0 +1,38 @@
60
1
// Copyright 2014 Canonical Ltd.
61
2
// Licensed under the AGPLv3, see LICENCE file for details.
62
3
63
4
package local
64
5
65
6
import (
66
7
	"os"
67
8
	"strconv"
68
9
69
10
	"launchpad.net/juju-core/instance"
70
11
	"launchpad.net/juju-core/version"
71
12
)
72
13
73
14
// envKeyTestingForceSlow is an environment variable name to force the slow
74
15
// lxc path. Setting to any non-empty value will force the slow path.
75
16
const envKeyTestingForceSlow = "JUJU_TESTING_LXC_FORCE_SLOW"
76
17
77
18
// releaseVersion is a function that returns a string representing the
78
19
// DISTRIB_RELEASE from the /etc/lsb-release file.
79
20
var releaseVersion = version.ReleaseVersion
80
21
81
22
func useFastLXC(containerType instance.ContainerType) bool {
82
23
	if containerType != instance.LXC {
83
24
		return false
84
25
	}
85
26
	if os.Getenv(envKeyTestingForceSlow) != "" {
86
27
		return false
87
28
	}
88
29
	release := releaseVersion()
89
30
	if release == "" {
90
31
		return false
91
32
	}
92
33
	value, err := strconv.ParseFloat(release, 64)
93
34
	if err != nil {
94
35
		return false
95
36
	}
96
37
	return value >= 14.04
97
38
}
98
0
39
99
=== added file 'provider/local/lxc_test.go'
100
--- provider/local/lxc_test.go	1970-01-01 00:00:00 +0000
101
+++ provider/local/lxc_test.go	2014-03-11 01:19:21 +0000
102
@@ -0,0 +1,59 @@
103
1
// Copyright 2014 Canonical Ltd.
104
2
// Licensed under the AGPLv3, see LICENCE file for details.
105
3
106
4
package local_test
107
5
108
6
import (
109
7
	gc "launchpad.net/gocheck"
110
8
111
9
	"launchpad.net/juju-core/instance"
112
10
	"launchpad.net/juju-core/provider/local"
113
11
	jc "launchpad.net/juju-core/testing/checkers"
114
12
	"launchpad.net/juju-core/testing/testbase"
115
13
)
116
14
117
15
type lxcTest struct {
118
16
	testbase.LoggingSuite
119
17
}
120
18
121
19
var _ = gc.Suite(&lxcTest{})
122
20
123
21
func (*lxcTest) TestUseFastLXCForContainer(c *gc.C) {
124
22
	c.Assert(local.UseFastLXC(instance.ContainerType("")), jc.IsFalse)
125
23
	c.Assert(local.UseFastLXC(instance.KVM), jc.IsFalse)
126
24
}
127
25
128
26
func (t *lxcTest) TestUseFastLXC(c *gc.C) {
129
27
	for i, test := range []struct {
130
28
		message        string
131
29
		releaseVersion string
132
30
		expected       bool
133
31
		overrideSlow   string
134
32
	}{{
135
33
		message: "missing release file",
136
34
	}, {
137
35
		message:        "precise release",
138
36
		releaseVersion: "12.04",
139
37
	}, {
140
38
		message:        "trusty release",
141
39
		releaseVersion: "14.04",
142
40
		expected:       true,
143
41
	}, {
144
42
		message:        "unstable unicorn",
145
43
		releaseVersion: "14.10",
146
44
		expected:       true,
147
45
	}, {
148
46
		message:        "jaunty",
149
47
		releaseVersion: "9.10",
150
48
	}, {
151
49
		message:        "env override",
152
50
		releaseVersion: "14.04",
153
51
		overrideSlow:   "value",
154
52
	}} {
155
53
		c.Logf("%v: %v", i, test.message)
156
54
		t.PatchValue(local.ReleaseVersion, func() string { return test.releaseVersion })
157
55
		t.PatchEnvironment(local.EnvKeyTestingForceSlow, test.overrideSlow)
158
56
		value := local.UseFastLXC(instance.LXC)
159
57
		c.Assert(value, gc.Equals, test.expected)
160
58
	}
161
59
}
162
0
60
163
=== modified file 'version/export_test.go'
164
--- version/export_test.go	2013-09-04 13:24:57 +0000
165
+++ version/export_test.go	2014-03-11 01:19:21 +0000
166
@@ -3,4 +3,7 @@
167
3
3
168
4
package version
4
package version
169
5
5
171
6
var ReadSeries = readSeries
6
var (
172
7
	ReadSeries        = readSeries
173
8
	LSBReleaseFileVar = &lsbReleaseFile
174
9
)
175
7
10
176
=== modified file 'version/version.go'
177
--- version/version.go	2014-03-06 16:08:30 +0000
178
+++ version/version.go	2014-03-11 01:19:21 +0000
179
@@ -24,12 +24,16 @@
180
24
// number of the release package.
24
// number of the release package.
181
25
const version = "1.17.5"
25
const version = "1.17.5"
182
26
26
183
27
// lsbReleaseFile is the name of the file that is read in order to determine
184
28
// the release version of ubuntu.
185
29
var lsbReleaseFile = "/etc/lsb-release"
186
30
187
27
// Current gives the current version of the system.  If the file
31
// Current gives the current version of the system.  If the file
188
28
// "FORCE-VERSION" is present in the same directory as the running
32
// "FORCE-VERSION" is present in the same directory as the running
189
29
// binary, it will override this.
33
// binary, it will override this.
190
30
var Current = Binary{
34
var Current = Binary{
191
31
	Number: MustParse(version),
35
	Number: MustParse(version),
193
32
	Series: readSeries("/etc/lsb-release"),
36
	Series: readSeries(lsbReleaseFile),
194
33
	Arch:   ubuntuArch(runtime.GOARCH),
37
	Arch:   ubuntuArch(runtime.GOARCH),
195
34
}
38
}
196
35
39
197
@@ -311,14 +315,31 @@
198
311
		return "unknown"
315
		return "unknown"
199
312
	}
316
	}
200
313
	for _, line := range strings.Split(string(data), "\n") {
317
	for _, line := range strings.Split(string(data), "\n") {
204
314
		const p = "DISTRIB_CODENAME="
318
		const prefix = "DISTRIB_CODENAME="
205
315
		if strings.HasPrefix(line, p) {
319
		if strings.HasPrefix(line, prefix) {
206
316
			return strings.Trim(line[len(p):], "\t '\"")
320
			return strings.Trim(line[len(prefix):], "\t '\"")
207
317
		}
321
		}
208
318
	}
322
	}
209
319
	return "unknown"
323
	return "unknown"
210
320
}
324
}
211
321
325
212
326
// ReleaseVersion looks for the value of DISTRIB_RELEASE in the content of
213
327
// the lsbReleaseFile.  If the value is not found, the file is not found, or
214
328
// an error occurs reading the file, an empty string is returned.
215
329
func ReleaseVersion() string {
216
330
	content, err := ioutil.ReadFile(lsbReleaseFile)
217
331
	if err != nil {
218
332
		return ""
219
333
	}
220
334
	const prefix = "DISTRIB_RELEASE="
221
335
	for _, line := range strings.Split(string(content), "\n") {
222
336
		if strings.HasPrefix(line, prefix) {
223
337
			return strings.Trim(line[len(prefix):], "\t '\"")
224
338
		}
225
339
	}
226
340
	return ""
227
341
}
228
342
229
322
func ubuntuArch(arch string) string {
343
func ubuntuArch(arch string) string {
230
323
	if arch == "386" {
344
	if arch == "386" {
231
324
		arch = "i386"
345
		arch = "i386"
232
325
346
233
=== modified file 'version/version_test.go'
234
--- version/version_test.go	2014-03-06 16:08:30 +0000
235
+++ version/version_test.go	2014-03-11 01:19:21 +0000
236
@@ -5,6 +5,8 @@
237
5
5
238
6
import (
6
import (
239
7
	"encoding/json"
7
	"encoding/json"
240
8
	"io/ioutil"
241
9
	"path/filepath"
242
8
	"strings"
10
	"strings"
243
9
	"testing"
11
	"testing"
244
10
12
245
@@ -12,12 +14,15 @@
246
12
	gc "launchpad.net/gocheck"
14
	gc "launchpad.net/gocheck"
247
13
	"launchpad.net/goyaml"
15
	"launchpad.net/goyaml"
248
14
16
249
17
	"launchpad.net/juju-core/testing/testbase"
250
15
	"launchpad.net/juju-core/version"
18
	"launchpad.net/juju-core/version"
251
16
)
19
)
252
17
20
254
18
type suite struct{}
21
type suite struct {
255
22
	testbase.LoggingSuite
256
23
}
257
19
24
259
20
var _ = gc.Suite(suite{})
25
var _ = gc.Suite(&suite{})
260
21
26
261
22
func Test(t *testing.T) {
27
func Test(t *testing.T) {
262
23
	gc.TestingT(t)
28
	gc.TestingT(t)
263
@@ -44,7 +49,7 @@
264
44
	{"2.0.1.10", "2.0.0.0", 1},
49
	{"2.0.1.10", "2.0.0.0", 1},
265
45
}
50
}
266
46
51
268
47
func (suite) TestCompare(c *gc.C) {
52
func (*suite) TestCompare(c *gc.C) {
269
48
	for i, test := range cmpTests {
53
	for i, test := range cmpTests {
270
49
		c.Logf("test %d", i)
54
		c.Logf("test %d", i)
271
50
		v1, err := version.Parse(test.v1)
55
		v1, err := version.Parse(test.v1)
272
@@ -106,7 +111,7 @@
273
106
	err: "invalid version.*",
111
	err: "invalid version.*",
274
107
}}
112
}}
275
108
113
277
109
func (suite) TestParse(c *gc.C) {
114
func (*suite) TestParse(c *gc.C) {
278
110
	for i, test := range parseTests {
115
	for i, test := range parseTests {
279
111
		c.Logf("test %d", i)
116
		c.Logf("test %d", i)
280
112
		got, err := version.Parse(test.v)
117
		got, err := version.Parse(test.v)
281
@@ -152,7 +157,7 @@
282
152
	err: "invalid binary version.*",
157
	err: "invalid binary version.*",
283
153
}}
158
}}
284
154
159
286
155
func (suite) TestParseBinary(c *gc.C) {
160
func (*suite) TestParseBinary(c *gc.C) {
287
156
	for i, test := range parseBinaryTests {
161
	for i, test := range parseBinaryTests {
288
157
		c.Logf("test 1: %d", i)
162
		c.Logf("test 1: %d", i)
289
158
		got, err := version.ParseBinary(test.v)
163
		got, err := version.ParseBinary(test.v)
290
@@ -201,7 +206,7 @@
291
201
	goyaml.Unmarshal,
206
	goyaml.Unmarshal,
292
202
}}
207
}}
293
203
208
295
204
func (suite) TestBinaryMarshalUnmarshal(c *gc.C) {
209
func (*suite) TestBinaryMarshalUnmarshal(c *gc.C) {
296
205
	for _, m := range marshallers {
210
	for _, m := range marshallers {
297
206
		c.Logf("encoding %v", m.name)
211
		c.Logf("encoding %v", m.name)
298
207
		type doc struct {
212
		type doc struct {
299
@@ -220,7 +225,7 @@
300
220
	}
225
	}
301
221
}
226
}
302
222
227
304
223
func (suite) TestNumberMarshalUnmarshal(c *gc.C) {
228
func (*suite) TestNumberMarshalUnmarshal(c *gc.C) {
305
224
	for _, m := range marshallers {
229
	for _, m := range marshallers {
306
225
		c.Logf("encoding %v", m.name)
230
		c.Logf("encoding %v", m.name)
307
226
		type doc struct {
231
		type doc struct {
308
@@ -260,7 +265,7 @@
309
260
	err: `invalid major version number blah: strconv.ParseInt: parsing "blah": invalid syntax`,
265
	err: `invalid major version number blah: strconv.ParseInt: parsing "blah": invalid syntax`,
310
261
}}
266
}}
311
262
267
313
263
func (suite) TestParseMajorMinor(c *gc.C) {
268
func (*suite) TestParseMajorMinor(c *gc.C) {
314
264
	for i, test := range parseMajorMinorTests {
269
	for i, test := range parseMajorMinorTests {
315
265
		c.Logf("test %d", i)
270
		c.Logf("test %d", i)
316
266
		major, minor, err := version.ParseMajorMinor(test.v)
271
		major, minor, err := version.ParseMajorMinor(test.v)
317
@@ -273,3 +278,56 @@
318
273
		}
278
		}
319
274
	}
279
	}
320
275
}
280
}
321
281
322
282
func (s *suite) TestUseFastLXC(c *gc.C) {
323
283
	for i, test := range []struct {
324
284
		message        string
325
285
		releaseContent string
326
286
		expected       string
327
287
	}{{
328
288
		message: "missing release file",
329
289
	}, {
330
290
		message:        "missing prefix in file",
331
291
		releaseContent: "some junk\nand more junk",
332
292
	}, {
333
293
		message: "precise release",
334
294
		releaseContent: `
335
295
DISTRIB_ID=Ubuntu
336
296
DISTRIB_RELEASE=12.04
337
297
DISTRIB_CODENAME=precise
338
298
DISTRIB_DESCRIPTION="Ubuntu 12.04.3 LTS"
339
299
`,
340
300
		expected: "12.04",
341
301
	}, {
342
302
		message: "trusty release",
343
303
		releaseContent: `
344
304
DISTRIB_ID=Ubuntu
345
305
DISTRIB_RELEASE=14.04
346
306
DISTRIB_CODENAME=trusty
347
307
DISTRIB_DESCRIPTION="Ubuntu Trusty Tahr (development branch)"
348
308
`,
349
309
		expected: "14.04",
350
310
	}, {
351
311
		message:        "minimal trusty release",
352
312
		releaseContent: `DISTRIB_RELEASE=14.04`,
353
313
		expected:       "14.04",
354
314
	}, {
355
315
		message:        "minimal unstable unicorn",
356
316
		releaseContent: `DISTRIB_RELEASE=14.10`,
357
317
		expected:       "14.10",
358
318
	}, {
359
319
		message:        "minimal jaunty",
360
320
		releaseContent: `DISTRIB_RELEASE=9.10`,
361
321
		expected:       "9.10",
362
322
	}} {
363
323
		c.Logf("%v: %v", i, test.message)
364
324
		filename := filepath.Join(c.MkDir(), "lsbRelease")
365
325
		s.PatchValue(version.LSBReleaseFileVar, filename)
366
326
		if test.releaseContent != "" {
367
327
			err := ioutil.WriteFile(filename, []byte(test.releaseContent+"\n"), 0644)
368
328
			c.Assert(err, gc.IsNil)
369
329
		}
370
330
		value := version.ReleaseVersion()
371
331
		c.Assert(value, gc.Equals, test.expected)
372
332
	}
373
333
}
Status:	Merged
Approved by:	Tim Penhey on 2014-03-11
Approved revision:	no longer in the source branch.
Merged at revision:	2400
Proposed branch:	lp:~thumper/juju-core/fast-lxc
Merge into:	lp:~go-bot/juju-core/trunk
Prerequisite:	lp:~thumper/juju-core/maybe-add-cloud-archive-func
Diff against target:	373 lines (+205/-20) 7 files modified provider/local/environ.go (+5/-2) provider/local/export_test.go (+8/-5) provider/local/lxc.go (+38/-0) provider/local/lxc_test.go (+59/-0) version/export_test.go (+4/-1) version/version.go (+25/-4) version/version_test.go (+66/-8)
To merge this branch:	bzr merge lp:~thumper/juju-core/fast-lxc
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2014-03-06	Pending
Review via email: mp+209801@code.launchpad.net