1
=== modified file 'state/state_test.go'
2
--- state/state_test.go	2013-06-07 10:54:03 +0000
3
+++ state/state_test.go	2013-06-07 12:07:30 +0000
4
@@ -1236,3 +1236,93 @@
5
1236
	c.Assert(id, Equals, user.Name())
1236
	c.Assert(id, Equals, user.Name())
6
1237
	c.Assert(err, IsNil)
1237
	c.Assert(err, IsNil)
7
1238
}
1238
}
8
1239
9
1240
func (s *StateSuite) TestWatchCleanups(c *C) {
10
1241
	cw := s.State.WatchCleanups()
11
1242
	defer stop(c, cw)
12
1243
13
1244
	assertNoChange := func() {
14
1245
		s.State.StartSync()
15
1246
		select {
16
1247
		case _, ok := <-cw.Changes():
17
1248
			c.Fatalf("unexpected change: %v", ok)
18
1249
		case <-time.After(50 * time.Millisecond):
19
1250
		}
20
1251
	}
21
1252
	assertChanges := func(count int) {
22
1253
		s.State.StartSync()
23
1254
		for i := 0; i < count; i++ {
24
1255
			select {
25
1256
			case _, ok := <-cw.Changes():
26
1257
				c.Assert(ok, Equals, true)
27
1258
			case <-time.After(500 * time.Millisecond):
28
1259
				c.Fatalf("timed out waiting for change")
29
1260
			}
30
1261
		}
31
1262
		assertNoChange()
32
1263
	}
33
1264
34
1265
	// Check initial event.
35
1266
	assertChanges(1)
36
1267
37
1268
	// Add relations doesn't emit events.
38
1269
	_, err := s.State.AddService("wordpress", s.AddTestingCharm(c, "wordpress"))
39
1270
	c.Assert(err, IsNil)
40
1271
	_, err = s.State.AddService("mysql", s.AddTestingCharm(c, "mysql"))
41
1272
	c.Assert(err, IsNil)
42
1273
	eps, err := s.State.InferEndpoints([]string{"wordpress", "mysql"})
43
1274
	c.Assert(err, IsNil)
44
1275
	relM, err := s.State.AddRelation(eps...)
45
1276
	c.Assert(err, IsNil)
46
1277
	assertNoChange()
47
1278
	_, err = s.State.AddService("varnish", s.AddTestingCharm(c, "varnish"))
48
1279
	c.Assert(err, IsNil)
49
1280
	eps, err = s.State.InferEndpoints([]string{"wordpress", "varnish"})
50
1281
	c.Assert(err, IsNil)
51
1282
	relV, err := s.State.AddRelation(eps...)
52
1283
	c.Assert(err, IsNil)
53
1284
	assertNoChange()
54
1285
55
1286
	// Destroy relations and cleanup.
56
1287
	err = relM.Destroy()
57
1288
	c.Assert(err, IsNil)
58
1289
	assertChanges(1)
59
1290
	err = s.State.Cleanup()
60
1291
	c.Assert(err, IsNil)
61
1292
	assertChanges(1)
62
1293
	err = relV.Destroy()
63
1294
	c.Assert(err, IsNil)
64
1295
	assertChanges(1)
65
1296
	err = s.State.Cleanup()
66
1297
	c.Assert(err, IsNil)
67
1298
	assertChanges(1)
68
1299
69
1300
	// A cleanup without need doesn't emit events.
70
1301
	err = s.State.Cleanup()
71
1302
	c.Assert(err, IsNil)
72
1303
	assertNoChange()
73
1304
74
1305
	// Don't handle each event keeps them in the queue. Cleanups
75
1306
	// have a transaction per entry. So they create the according number
76
1307
	// of events. This behavior will change in a followup with a cleanup 
77
1308
	// redesign.
78
1309
	eps, err = s.State.InferEndpoints([]string{"wordpress", "mysql"})
79
1310
	c.Assert(err, IsNil)
80
1311
	relM, err = s.State.AddRelation(eps...)
81
1312
	c.Assert(err, IsNil)
82
1313
	assertNoChange()
83
1314
	eps, err = s.State.InferEndpoints([]string{"wordpress", "varnish"})
84
1315
	c.Assert(err, IsNil)
85
1316
	relV, err = s.State.AddRelation(eps...)
86
1317
	c.Assert(err, IsNil)
87
1318
	assertNoChange()
88
1319
	err = relM.Destroy()
89
1320
	c.Assert(err, IsNil)
90
1321
	err = relV.Destroy()
91
1322
	c.Assert(err, IsNil)
92
1323
	assertChanges(2)
93
1324
	err = s.State.Cleanup()
94
1325
	c.Assert(err, IsNil)
95
1326
	assertChanges(2)
96
1327
97
1328
}
98
1239
1329
99
=== modified file 'state/watcher.go'
100
--- state/watcher.go	2013-06-07 10:54:03 +0000
101
+++ state/watcher.go	2013-06-07 12:07:30 +0000
102
@@ -1231,3 +1231,55 @@
103
1231
	}
1231
	}
104
1232
	panic("unreachable")
1232
	panic("unreachable")
105
1233
}
1233
}
106
1234
107
1235
// CleanupWatcher notifies changes of the cleanup documents 
108
1236
// signalling the need for a cleanup.
109
1237
type CleanupWatcher struct {
110
1238
	commonWatcher
111
1239
	out chan struct{}
112
1240
}
113
1241
114
1242
// WatchCleanups returns a CleanupWatcher that notifies when documents
115
1243
// that where marked for removal exist.
116
1244
func (st *State) WatchCleanups() *CleanupWatcher {
117
1245
	return newCleanupWatcher(st)
118
1246
}
119
1247
120
1248
func newCleanupWatcher(st *State) *CleanupWatcher {
121
1249
	w := &CleanupWatcher{
122
1250
		commonWatcher: commonWatcher{st: st},
123
1251
		out:           make(chan struct{}),
124
1252
	}
125
1253
	go func() {
126
1254
		defer w.tomb.Done()
127
1255
		defer close(w.out)
128
1256
		w.tomb.Kill(w.loop())
129
1257
	}()
130
1258
	return w
131
1259
}
132
1260
133
1261
// Changes returns the event channel for w.
134
1262
func (w *CleanupWatcher) Changes() <-chan struct{} {
135
1263
	return w.out
136
1264
}
137
1265
138
1266
func (w *CleanupWatcher) loop() (err error) {
139
1267
	in := make(chan watcher.Change)
140
1268
141
1269
	w.st.watcher.WatchCollection(w.st.cleanups.Name, in)
142
1270
	defer w.st.watcher.UnwatchCollection(w.st.cleanups.Name, in)
143
1271
144
1272
	// Initial event.
145
1273
	w.out <- struct{}{}
146
1274
147
1275
	for {
148
1276
		select {
149
1277
		case <-w.tomb.Dying():
150
1278
			return tomb.ErrDying
151
1279
		case <-in:
152
1280
			// Simply emit event for each change.
153
1281
			w.out <- struct{}{}
154
1282
		}
155
1283
	}
156
1284
	panic("unreachable")
157
1285
}
Status:	Merged
Merged at revision:	1259
Proposed branch:	lp:~themue/juju-core/024-cleanup-watcher
Merge into:	lp:~juju/juju-core/trunk
Diff against target:	157 lines (+142/-0) 2 files modified state/state_test.go (+90/-0) state/watcher.go (+52/-0)
To merge this branch:	bzr merge lp:~themue/juju-core/024-cleanup-watcher
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2013-06-06	Pending
Review via email: mp+167748@code.launchpad.net