1
=== added file 'state/action.go'
2
--- state/action.go	1970-01-01 00:00:00 +0000
3
+++ state/action.go	2014-05-23 14:50:36 +0000
4
@@ -0,0 +1,46 @@
5
1
package state
6
2
7
3
import ()
8
4
9
5
type actionDoc struct {
10
6
	Id string `bson:"_id"`
11
7
12
8
	// Name identifies the action; it should match an action defined by
13
9
	// the unit's charm.
14
10
	Name string
15
11
16
12
	// Payload holds the action's parameters, if any; it should validate
17
13
	// against the schema defined by the named action in the unit's charm
18
14
	Payload map[string]interface{}
19
15
}
20
16
21
17
// Action represents an instruction to do some "action" and is expected
22
18
// to match an action definition in a charm.
23
19
type Action struct {
24
20
	st  *State
25
21
	doc actionDoc
26
22
}
27
23
28
24
func newAction(st *State, adoc actionDoc) *Action {
29
25
	return &Action{
30
26
		st:  st,
31
27
		doc: adoc,
32
28
	}
33
29
}
34
30
35
31
// Name returns the name of the Action
36
32
func (a *Action) Name() string {
37
33
	return a.doc.Name
38
34
}
39
35
40
36
// Id returns the id of the Action
41
37
func (a *Action) Id() string {
42
38
	return a.doc.Id
43
39
}
44
40
45
41
// Payload will contain a structure representing arguments or parameters to
46
42
// an action, and is expected to be validated by the Unit using the Charm
47
43
// definition of the Action
48
44
func (a *Action) Payload() map[string]interface{} {
49
45
	return a.doc.Payload
50
46
}
51
0
47
52
=== added file 'state/action_test.go'
53
--- state/action_test.go	1970-01-01 00:00:00 +0000
54
+++ state/action_test.go	2014-05-23 14:50:36 +0000
55
@@ -0,0 +1,99 @@
56
1
// Copyright 2014 Canonical Ltd.
57
2
// Licensed under the AGPLv3, see LICENCE file for details.
58
3
59
4
package state_test
60
5
61
6
import (
62
7
	jc "github.com/juju/testing/checkers"
63
8
	gc "launchpad.net/gocheck"
64
9
65
10
	"launchpad.net/juju-core/state"
66
11
)
67
12
68
13
type ActionSuite struct {
69
14
	ConnSuite
70
15
	charm   *state.Charm
71
16
	service *state.Service
72
17
	unit    *state.Unit
73
18
}
74
19
75
20
var _ = gc.Suite(&ActionSuite{})
76
21
77
22
func (s *ActionSuite) SetUpTest(c *gc.C) {
78
23
	s.ConnSuite.SetUpTest(c)
79
24
	s.charm = s.AddTestingCharm(c, "wordpress")
80
25
	var err error
81
26
	s.service = s.AddTestingService(c, "wordpress", s.charm)
82
27
	c.Assert(err, gc.IsNil)
83
28
	s.unit, err = s.service.AddUnit()
84
29
	c.Assert(err, gc.IsNil)
85
30
	c.Assert(s.unit.Series(), gc.Equals, "quantal")
86
31
}
87
32
88
33
func (s *ActionSuite) TestAddAction(c *gc.C) {
89
34
	actionName := "fakeaction"
90
35
	actionParams := map[string]interface{}{"outfile": "outfile.tar.bz2"}
91
36
92
37
	// verify can add an Action
93
38
	actionId, err := s.unit.AddAction(actionName, actionParams)
94
39
	c.Assert(err, gc.IsNil)
95
40
	assertSaneActionId(c, actionId, s.unit.Name())
96
41
97
42
	// verify we can get it back out by Id
98
43
	action, err := s.State.Action(actionId)
99
44
	c.Assert(err, gc.IsNil)
100
45
	c.Assert(action, gc.NotNil)
101
46
	c.Assert(action.Id(), gc.Equals, actionId)
102
47
103
48
	// verify we get out what we put in
104
49
	c.Assert(action.Name(), gc.Equals, actionName)
105
50
	c.Assert(action.Payload(), jc.DeepEquals, actionParams)
106
51
}
107
52
108
53
func (s *ActionSuite) TestAddActionLifecycle(c *gc.C) {
109
54
	unit, err := s.State.Unit(s.unit.Name())
110
55
	c.Assert(err, gc.IsNil)
111
56
	preventUnitDestroyRemove(c, unit)
112
57
113
58
	// make unit state Dying
114
59
	err = unit.Destroy()
115
60
	c.Assert(err, gc.IsNil)
116
61
117
62
	// can add action to a dying unit
118
63
	actionId, err := unit.AddAction("fakeaction1", map[string]interface{}{})
119
64
	c.Assert(err, gc.IsNil)
120
65
	assertSaneActionId(c, actionId, s.unit.Name())
121
66
122
67
	// make sure unit is dead
123
68
	err = unit.EnsureDead()
124
69
	c.Assert(err, gc.IsNil)
125
70
126
71
	// cannot add action to a dead unit
127
72
	_, err = unit.AddAction("fakeaction2", map[string]interface{}{})
128
73
	c.Assert(err, gc.ErrorMatches, "unit .* is dead")
129
74
}
130
75
131
76
func (s *ActionSuite) TestAddActionFailsOnDeadUnitInTransaction(c *gc.C) {
132
77
	unit, err := s.State.Unit(s.unit.Name())
133
78
	c.Assert(err, gc.IsNil)
134
79
	preventUnitDestroyRemove(c, unit)
135
80
136
81
	killUnit := state.TransactionHook{
137
82
		Before: func() {
138
83
			c.Assert(unit.Destroy(), gc.IsNil)
139
84
			c.Assert(unit.EnsureDead(), gc.IsNil)
140
85
		},
141
86
	}
142
87
	defer state.SetTransactionHooks(c, s.State, killUnit).Check()
143
88
144
89
	_, err = unit.AddAction("fakeaction", map[string]interface{}{})
145
90
	c.Assert(err, gc.ErrorMatches, "unit .* is dead")
146
91
}
147
92
148
93
// assertSaneActionId verifies that the actionId is of the expected
149
94
// form (unit id prefix + sequence)
150
95
// This is a temporary assertion, we shouldn't be leaking the actual
151
96
// mongo _id
152
97
func assertSaneActionId(c *gc.C, actionId, unitName string) {
153
98
	c.Assert(actionId, gc.Matches, "^u#"+unitName+"#\\d+")
154
99
}
155
0
100
156
=== modified file 'state/open.go'
157
--- state/open.go	2014-05-13 04:30:48 +0000
158
+++ state/open.go	2014-05-23 14:50:36 +0000
159
@@ -292,6 +292,7 @@
160
292
		settingsrefs:      db.C("settingsrefs"),
292
		settingsrefs:      db.C("settingsrefs"),
161
293
		constraints:       db.C("constraints"),
293
		constraints:       db.C("constraints"),
162
294
		units:             db.C("units"),
294
		units:             db.C("units"),
163
295
		actions:           db.C("actions"),
164
295
		users:             db.C("users"),
296
		users:             db.C("users"),
165
296
		presence:          pdb.C("presence"),
297
		presence:          pdb.C("presence"),
166
297
		cleanups:          db.C("cleanups"),
298
		cleanups:          db.C("cleanups"),
167
298
299
168
=== modified file 'state/state.go'
169
--- state/state.go	2014-05-20 22:58:59 +0000
170
+++ state/state.go	2014-05-23 14:50:36 +0000
171
@@ -1,7 +1,7 @@
172
1
// Copyright 2012, 2013 Canonical Ltd.
1
// Copyright 2012, 2013 Canonical Ltd.
173
2
// Licensed under the AGPLv3, see LICENCE file for details.
2
// Licensed under the AGPLv3, see LICENCE file for details.
174
3
3
176
4
// The state package enables reading, observing, and changing
4
// Package state enables reading, observing, and changing
177
5
// the state stored in MongoDB of a whole environment
5
// the state stored in MongoDB of a whole environment
178
6
// managed by juju.
6
// managed by juju.
179
7
package state
7
package state
180
@@ -64,6 +64,7 @@
181
64
	settingsrefs      *mgo.Collection
64
	settingsrefs      *mgo.Collection
182
65
	constraints       *mgo.Collection
65
	constraints       *mgo.Collection
183
66
	units             *mgo.Collection
66
	units             *mgo.Collection
184
67
	actions           *mgo.Collection
185
67
	users             *mgo.Collection
68
	users             *mgo.Collection
186
68
	presence          *mgo.Collection
69
	presence          *mgo.Collection
187
69
	cleanups          *mgo.Collection
70
	cleanups          *mgo.Collection
188
@@ -316,7 +317,7 @@
189
316
	}
317
	}
190
317
318
191
318
	validAttrs := validCfg.AllAttrs()
319
	validAttrs := validCfg.AllAttrs()
193
319
	for k, _ := range oldConfig.AllAttrs() {
320
	for k := range oldConfig.AllAttrs() {
194
320
		if _, ok := validAttrs[k]; !ok {
321
		if _, ok := validAttrs[k]; !ok {
195
321
			settings.Delete(k)
322
			settings.Delete(k)
196
322
		}
323
		}
197
@@ -1394,6 +1395,19 @@
198
1394
	return rdc[i].Id < rdc[j].Id
1395
	return rdc[i].Id < rdc[j].Id
199
1395
}
1396
}
200
1396
1397
201
1398
// Action returns an Action by Id.
202
1399
func (st *State) Action(id string) (*Action, error) {
203
1400
	doc := actionDoc{}
204
1401
	err := st.actions.FindId(id).One(&doc)
205
1402
	if err == mgo.ErrNotFound {
206
1403
		return nil, errors.NotFoundf("action %q", id)
207
1404
	}
208
1405
	if err != nil {
209
1406
		return nil, fmt.Errorf("cannot get action %q: %v", id, err)
210
1407
	}
211
1408
	return newAction(st, doc), nil
212
1409
}
213
1410
214
1397
// Unit returns a unit by name.
1411
// Unit returns a unit by name.
215
1398
func (st *State) Unit(name string) (*Unit, error) {
1412
func (st *State) Unit(name string) (*Unit, error) {
216
1399
	if !names.IsUnit(name) {
1413
	if !names.IsUnit(name) {
217
1400
1414
218
=== modified file 'state/unit.go'
219
--- state/unit.go	2014-05-20 17:57:10 +0000
220
+++ state/unit.go	2014-05-23 14:50:36 +0000
221
@@ -803,6 +803,7 @@
222
803
	return fmt.Sprintf("unit %q is not assigned to a machine", e.Unit)
803
	return fmt.Sprintf("unit %q is not assigned to a machine", e.Unit)
223
804
}
804
}
224
805
805
225
806
// IsNotAssigned verifies that err is an instance of NotAssignedError
226
806
func IsNotAssigned(err error) bool {
807
func IsNotAssigned(err error) bool {
227
807
	_, ok := err.(*NotAssignedError)
808
	_, ok := err.(*NotAssignedError)
228
808
	return ok
809
	return ok
229
@@ -1327,6 +1328,49 @@
230
1327
	return nil
1328
	return nil
231
1328
}
1329
}
232
1329
1330
233
1331
// AddAction adds a new Action of type name and using arguments payload to
234
1332
// this Unit, and returns its ID
235
1333
func (u *Unit) AddAction(name string, payload map[string]interface{}) (string, error) {
236
1334
237
1335
	prefix := fmt.Sprintf("u#%s#", u.doc.Name)
238
1336
	suffix, err := u.st.sequence(prefix)
239
1337
	if err != nil {
240
1338
		return "", fmt.Errorf("cannot assign new sequence for prefix '%s'. %s", prefix, err)
241
1339
	}
242
1340
243
1341
	newActionID := fmt.Sprintf("%s%d", prefix, suffix)
244
1342
245
1343
	doc := actionDoc{Id: newActionID, Name: name, Payload: payload}
246
1344
	ops := []txn.Op{{
247
1345
		C:      u.st.units.Name,
248
1346
		Id:     u.doc.Name,
249
1347
		Assert: notDeadDoc,
250
1348
	}, {
251
1349
		C:      u.st.actions.Name,
252
1350
		Id:     doc.Id,
253
1351
		Assert: txn.DocMissing,
254
1352
		Insert: doc,
255
1353
	}}
256
1354
257
1355
	for i := 0; i < 3; i++ {
258
1356
		if notDead, err := isNotDead(u.st.units, u.doc.Name); err != nil {
259
1357
			return "", err
260
1358
		} else if !notDead {
261
1359
			return "", fmt.Errorf("unit %q is dead", u)
262
1360
		}
263
1361
264
1362
		switch err := u.st.runTransaction(ops); err {
265
1363
		case txn.ErrAborted:
266
1364
			continue
267
1365
		case nil:
268
1366
			return newActionID, nil
269
1367
		default:
270
1368
			return "", err
271
1369
		}
272
1370
	}
273
1371
	return "", ErrExcessiveContention
274
1372
}
275
1373
276
1330
// Resolve marks the unit as having had any previous state transition
1374
// Resolve marks the unit as having had any previous state transition
277
1331
// problems resolved, and informs the unit that it may attempt to
1375
// problems resolved, and informs the unit that it may attempt to
278
1332
// reestablish normal workflow. The retryHooks parameter informs
1376
// reestablish normal workflow. The retryHooks parameter informs
Status:	Merged
Approved by:	William Reade on 2014-05-23
Approved revision:	no longer in the source branch.
Merged at revision:	2787
Proposed branch:	lp:~johnweldon4/juju-core/action
Merge into:	lp:~go-bot/juju-core/trunk
Diff against target:	278 lines (+206/-2) 5 files modified state/action.go (+46/-0) state/action_test.go (+99/-0) state/open.go (+1/-0) state/state.go (+16/-2) state/unit.go (+44/-0)
To merge this branch:	bzr merge lp:~johnweldon4/juju-core/action
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
William Reade		2014-05-12	Pending
Review via email: mp+219225@code.launchpad.net