1
=== modified file 'cmd/jujud/provisioning.go'
2
--- cmd/jujud/provisioning.go	2012-05-08 19:29:43 +0000
3
+++ cmd/jujud/provisioning.go	2012-06-05 08:03:19 +0000
4
@@ -1,9 +1,16 @@
5
1
package main
1
package main
6
2
2
7
3
import (
3
import (
8
4
	"fmt"
9
5
	"launchpad.net/gnuflag"
4
	"launchpad.net/gnuflag"
10
6
	"launchpad.net/juju/go/cmd"
5
	"launchpad.net/juju/go/cmd"
11
6
	"launchpad.net/juju/go/environs"
12
7
	"launchpad.net/juju/go/log"
13
8
	"launchpad.net/juju/go/state"
14
9
	"launchpad.net/tomb"
15
10
16
11
	// register providers
17
12
	_ "launchpad.net/juju/go/environs/dummy"
18
13
	_ "launchpad.net/juju/go/environs/ec2"
19
7
)
14
)
20
8
15
21
9
// ProvisioningAgent is a cmd.Command responsible for running a provisioning agent.
16
// ProvisioningAgent is a cmd.Command responsible for running a provisioning agent.
22
@@ -27,5 +34,109 @@
23
27
34
24
28
// Run runs a provisioning agent.
35
// Run runs a provisioning agent.
25
29
func (a *ProvisioningAgent) Run(_ *cmd.Context) error {
36
func (a *ProvisioningAgent) Run(_ *cmd.Context) error {
28
30
	return fmt.Errorf("MachineAgent.Run not implemented")
37
	// TODO(dfc) place the logic in a loop with a suitable delay
29
31
}
38
	st, err := state.Open(&a.Conf.StateInfo)
30
39
	if err != nil {
31
40
		return err
32
41
	}
33
42
	p := NewProvisioner(st)
34
43
	return p.Wait()
35
44
}
36
45
37
46
type Provisioner struct {
38
47
	st      *state.State
39
48
	environ environs.Environ
40
49
	tomb    tomb.Tomb
41
50
42
51
	environWatcher  *state.ConfigWatcher
43
52
	machinesWatcher *state.MachinesWatcher
44
53
}
45
54
46
55
// NewProvisioner returns a Provisioner.
47
56
func NewProvisioner(st *state.State) *Provisioner {
48
57
	p := &Provisioner{
49
58
		st: st,
50
59
	}
51
60
	go p.loop()
52
61
	return p
53
62
}
54
63
55
64
func (p *Provisioner) loop() {
56
65
	defer p.tomb.Done()
57
66
58
67
	p.environWatcher = p.st.WatchEnvironConfig()
59
68
	// TODO(dfc) we need a method like state.IsConnected() here to exit cleanly if
60
69
	// there is a connection problem.
61
70
	for {
62
71
		select {
63
72
		case <-p.tomb.Dying():
64
73
			return
65
74
		case config, ok := <-p.environWatcher.Changes():
66
75
			if !ok {
67
76
				err := p.environWatcher.Stop()
68
77
				if err != nil {
69
78
					p.tomb.Kill(err)
70
79
				}
71
80
				return
72
81
			}
73
82
			var err error
74
83
			p.environ, err = environs.NewEnviron(config.Map())
75
84
			if err != nil {
76
85
				log.Printf("provisioner loaded invalid environment configuration: %v", err)
77
86
				continue
78
87
			}
79
88
			log.Printf("provisioner loaded new environment configuration")
80
89
			p.innerLoop()
81
90
		}
82
91
	}
83
92
}
84
93
85
94
func (p *Provisioner) innerLoop() {
86
95
	p.machinesWatcher = p.st.WatchMachines()
87
96
	// TODO(dfc) we need a method like state.IsConnected() here to exit cleanly if
88
97
	// there is a connection problem.
89
98
	for {
90
99
		select {
91
100
		case <-p.tomb.Dying():
92
101
			return
93
102
		case change, ok := <-p.environWatcher.Changes():
94
103
			if !ok {
95
104
				err := p.environWatcher.Stop()
96
105
				if err != nil {
97
106
					p.tomb.Kill(err)
98
107
				}
99
108
				return
100
109
			}
101
110
			config, err := environs.NewConfig(change.Map())
102
111
			if err != nil {
103
112
				log.Printf("provisioner loaded invalid environment configuration: %v", err)
104
113
				continue
105
114
			}
106
115
			p.environ.SetConfig(config)
107
116
			log.Printf("provisioner loaded new environment configuration")
108
117
		case machines, ok := <-p.machinesWatcher.Changes():
109
118
			if !ok {
110
119
				err := p.machinesWatcher.Stop()
111
120
				if err != nil {
112
121
					p.tomb.Kill(err)
113
122
				}
114
123
				return
115
124
			}
116
125
			p.processMachines(machines)
117
126
		}
118
127
	}
119
128
}
120
129
121
130
// Wait waits for the Provisioner to exit.
122
131
func (p *Provisioner) Wait() error {
123
132
	return p.tomb.Wait()
124
133
}
125
134
126
135
// Stop stops the Provisioner and returns any error encountered while
127
136
// provisioning.
128
137
func (p *Provisioner) Stop() error {
129
138
	p.tomb.Kill(nil)
130
139
	return p.tomb.Wait()
131
140
}
132
141
133
142
func (p *Provisioner) processMachines(changes *state.MachinesChange) {}
134
32
143
135
=== modified file 'cmd/jujud/provisioning_test.go'
136
--- cmd/jujud/provisioning_test.go	2012-05-30 02:13:48 +0000
137
+++ cmd/jujud/provisioning_test.go	2012-06-05 08:03:19 +0000
138
@@ -2,13 +2,43 @@
139
2
2
140
3
import (
3
import (
141
4
	. "launchpad.net/gocheck"
4
	. "launchpad.net/gocheck"
142
5
	"launchpad.net/gozk/zookeeper"
143
5
	"launchpad.net/juju/go/cmd"
6
	"launchpad.net/juju/go/cmd"
144
7
	"launchpad.net/juju/go/environs/dummy"
145
8
	"launchpad.net/juju/go/state"
146
9
	"launchpad.net/juju/go/testing"
147
6
)
10
)
148
7
11
150
8
type ProvisioningSuite struct{}
12
type ProvisioningSuite struct {
151
13
	zkConn *zookeeper.Conn
152
14
	st     *state.State
153
15
}
154
9
16
155
10
var _ = Suite(&ProvisioningSuite{})
17
var _ = Suite(&ProvisioningSuite{})
156
11
18
157
19
func (s *ProvisioningSuite) SetUpTest(c *C) {
158
20
	zk, session, err := zookeeper.Dial(zkAddr, 15e9)
159
21
	c.Assert(err, IsNil)
160
22
	event := <-session
161
23
	c.Assert(event.Ok(), Equals, true)
162
24
	c.Assert(event.Type, Equals, zookeeper.EVENT_SESSION)
163
25
	c.Assert(event.State, Equals, zookeeper.STATE_CONNECTED)
164
26
165
27
	s.zkConn = zk
166
28
	info := &state.Info{
167
29
		Addrs: []string{zkAddr},
168
30
	}
169
31
	testing.ZkRemoveTree(s.zkConn, "/")
170
32
	s.st, err = state.Initialize(info)
171
33
	c.Assert(err, IsNil)
172
34
173
35
	dummy.Reset()
174
36
}
175
37
176
38
func (s *ProvisioningSuite) TearDownTest(c *C) {
177
39
	s.zkConn.Close()
178
40
}
179
41
180
12
func (s *ProvisioningSuite) TestParseSuccess(c *C) {
42
func (s *ProvisioningSuite) TestParseSuccess(c *C) {
181
13
	create := func() (cmd.Command, *AgentConf) {
43
	create := func() (cmd.Command, *AgentConf) {
182
14
		a := &ProvisioningAgent{}
44
		a := &ProvisioningAgent{}
183
@@ -22,3 +52,56 @@
184
22
	err := ParseAgentCommand(a, []string{"nincompoops"})
52
	err := ParseAgentCommand(a, []string{"nincompoops"})
185
23
	c.Assert(err, ErrorMatches, `unrecognized args: \["nincompoops"\]`)
53
	c.Assert(err, ErrorMatches, `unrecognized args: \["nincompoops"\]`)
186
24
}
54
}
187
55
188
56
func initProvisioningAgent() (*ProvisioningAgent, error) {
189
57
	args := []string{"--zookeeper-servers", zkAddr}
190
58
	c := &ProvisioningAgent{}
191
59
	return c, initCmd(c, args)
192
60
}
193
61
194
62
func (s *ProvisioningSuite) TestProvisionerStartStop(c *C) {
195
63
	p := NewProvisioner(s.st)
196
64
	c.Assert(p.Stop(), IsNil)
197
65
}
198
66
199
67
func (s *ProvisioningSuite) TestProvisionerEnvironmentChange(c *C) {
200
68
	p := NewProvisioner(s.st)
201
69
202
70
	// seed /environment to point to dummy
203
71
	env, err := s.st.Environment()
204
72
	c.Assert(err, IsNil)
205
73
	env.Set("type", "dummy")
206
74
	env.Set("zookeeper", false)
207
75
	env.Set("name", "testing")
208
76
	_, err = env.Write()
209
77
	c.Assert(err, IsNil)
210
78
211
79
	// twiddle with the environment
212
80
	env, err = s.st.Environment()
213
81
	c.Assert(err, IsNil)
214
82
	env.Set("name", "testing2")
215
83
	_, err = env.Write()
216
84
	c.Assert(err, IsNil)
217
85
	env.Set("name", "testing3")
218
86
	_, err = env.Write()
219
87
	c.Assert(p.Stop(), IsNil)
220
88
}
221
89
222
90
func (s *ProvisioningSuite) TestProvisionerStopOnStateClose(c *C) {
223
91
	p := NewProvisioner(s.st)
224
92
225
93
	// seed /environment to point to dummy
226
94
	env, err := s.st.Environment()
227
95
	c.Assert(err, IsNil)
228
96
	env.Set("type", "dummy")
229
97
	env.Set("zookeeper", false)
230
98
	env.Set("name", "testing")
231
99
	_, err = env.Write()
232
100
	c.Assert(err, IsNil)
233
101
234
102
	s.st.Close()
235
103
236
104
	c.Assert(p.Wait(), ErrorMatches, "watcher.*")
237
105
	c.Assert(p.Stop(), ErrorMatches, "watcher.*")
238
106
239
107
}
Status:	Merged
Approved by:	Gustavo Niemeyer on 2012-06-05
Approved revision:	207
Merged at revision:	201
Proposed branch:	lp:~dave-cheney/pyjuju/go-provisioning-strawman
Merge into:	lp:pyjuju/go
Diff against target:	239 lines (+198/-4) 2 files modified cmd/jujud/provisioning.go (+114/-3) cmd/jujud/provisioning_test.go (+84/-1)
To merge this branch:	bzr merge lp:~dave-cheney/pyjuju/go-provisioning-strawman
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2012-05-29	Pending
Review via email: mp+107714@code.launchpad.net