Fixed invalid FAIL about finished upgrade plans

ewoutp · ewoutp · commit bf15a0eabc47 · 2018-07-19T11:42:22.000+02:00
diff --git a/service/upgrade_manager.go b/service/upgrade_manager.go
@@ -126,6 +126,11 @@ type UpgradePlan struct {
 	ToVersion       driver.Version     `json:"to_version"`
 }
 
+// IsEmpty returns true when the given plan has not been initialized.
+func (p UpgradePlan) IsEmpty() bool {
+	return p.CreatedAt.IsZero()
+}
+
 // IsReady returns true when all entries have finished.
 func (p UpgradePlan) IsReady() bool {
 	return len(p.Entries) == 0
@@ -780,7 +785,7 @@ func (m *upgradeManager) RunWatchUpgradePlan(ctx context.Context) {
 			}
 		}
 		plan, err := m.readUpgradePlan(ctx)
-		if agency.IsKeyNotFound(err) {
+		if agency.IsKeyNotFound(err) || plan.IsEmpty() {
 			// Just try later
 		} else if err != nil {
 			// Failed to read plan

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,11 @@ type UpgradePlan struct {`
`126`	`126`	ToVersion driver.Version `json:"to_version"`
`127`	`127`	`}`
`128`	`128`
	`129`	`+// IsEmpty returns true when the given plan has not been initialized.`
	`130`	`+func (p UpgradePlan) IsEmpty() bool {`
	`131`	`+ return p.CreatedAt.IsZero()`
	`132`	`+}`
	`133`	`+`
`129`	`134`	`// IsReady returns true when all entries have finished.`
`130`	`135`	`func (p UpgradePlan) IsReady() bool {`
`131`	`136`	`return len(p.Entries) == 0`
`@@ -780,7 +785,7 @@ func (m *upgradeManager) RunWatchUpgradePlan(ctx context.Context) {`
`780`	`785`	`}`
`781`	`786`	`}`
`782`	`787`	`plan, err := m.readUpgradePlan(ctx)`
`783`		`- if agency.IsKeyNotFound(err) {`
	`788`	`+ if agency.IsKeyNotFound(err) \|\| plan.IsEmpty() {`
`784`	`789`	`// Just try later`
`785`	`790`	`} else if err != nil {`
`786`	`791`	`// Failed to read plan`