overlord/state: warnings/notices pruning not persisted

Signed-off-by: Harry Pidcock <harry.pidcock@canonical.com>

overlord/state/notices_test.go

@@ -701,6 +701,35 @@ func (s *noticesSuite) TestCheckpoint(c *C) {
 	c.Check(n["key"], Equals, "foo.com/bar")
 }
 
+func (s *noticesSuite) TestPruneNoticesCheckpoint(c *C) {
+	backend := &fakeStateBackend{}
+	st := state.New(backend)
+	st.Lock()
+	old := time.Now().Add(-8 * 24 * time.Hour)
+	addNotice(c, st, nil, state.ChangeUpdateNotice, "123", &state.AddNoticeOptions{
+		Time: old,
+	})
+	addNotice(c, st, nil, state.ChangeUpdateNotice, "456", nil)
+	st.Unlock()
+	c.Assert(backend.checkpoints, HasLen, 1)
+
+	st.Lock()
+	st.Prune(time.Now(), 0, 0, 0)
+	st.Unlock()
+	// Pruning the expired notice must mark the state modified so that the
+	// removal is checkpointed on unlock.
+	c.Assert(backend.checkpoints, HasLen, 2)
+
+	st, err := state.ReadState(nil, bytes.NewReader(backend.checkpoints[1]))
+	c.Assert(err, IsNil)
+	st.Lock()
+	defer st.Unlock()
+	notices := st.Notices(nil)
+	c.Assert(notices, HasLen, 1)
+	n := noticeToMap(c, notices[0])
+	c.Check(n["key"], Equals, "456")
+}
+
 func (s *noticesSuite) TestDeleteExpired(c *C) {
 	st := state.New(nil)
 	st.Lock()

overlord/state/state.go

@@ -574,6 +574,7 @@ func (s *State) pruneWarnings(now time.Time) {
 	defer s.warningsMu.Unlock()
 	for k, w := range s.warnings {
 		if w.ExpiredBefore(now) {
+			s.writing()
 			delete(s.warnings, k)
 		}
 	}
@@ -584,6 +585,7 @@ func (s *State) pruneNotices(now time.Time) {
 	defer s.noticesMu.Unlock()
 	for k, n := range s.notices {
 		if n.Expired(now) {
+			s.writing()
 			delete(s.notices, k)
 		}
 	}

overlord/state/warning_test.go

@@ -198,6 +198,33 @@ func (stateSuite) TestCheckpoint(c *check.C) {
 	c.Check(fmt.Sprintf("%q", ws), check.Equals, `["hello"]`)
 }
 
+func (stateSuite) TestPruneWarningsCheckpoint(c *check.C) {
+	b := &fakeStateBackend{}
+	st := state.New(b)
+	st.Lock()
+	st.AddWarning("old", &state.AddWarningOptions{
+		Time: time.Now().Add(-30 * 24 * time.Hour),
+	})
+	st.Warnf("new")
+	st.Unlock()
+	c.Assert(b.checkpoints, check.HasLen, 1)
+
+	st.Lock()
+	st.Prune(time.Now(), 0, 0, 0)
+	st.Unlock()
+	// Pruning the expired warning must mark the state modified so that the
+	// removal is checkpointed on unlock.
+	c.Assert(b.checkpoints, check.HasLen, 2)
+
+	st, err := state.ReadState(nil, bytes.NewReader(b.checkpoints[1]))
+	c.Assert(err, check.IsNil)
+	st.Lock()
+	defer st.Unlock()
+	ws := st.AllWarnings()
+	c.Assert(ws, check.HasLen, 1)
+	c.Check(ws[0].String(), check.Equals, "new")
+}
+
 func (stateSuite) TestWarningsSummaryReturnsLastLastAdded(c *check.C) {
 	st := state.New(nil)
 	st.Lock()