Include versions in plan & status

Author: ewoutp

client/api.go

@@ -140,6 +140,10 @@ type UpgradeStatus struct {
 	Failed bool `json:"failed"`
 	// Reasons contains a human readable description of the state
 	Reason string `json:"reason,omitempty"`
+	// FromVersions contains all database versions found that will be upgraded.
+	FromVersions []driver.Version `json:"from_versions"`
+	// ToVersion contains the database version that will be upgraded to.
+	ToVersion driver.Version `json:"to_version"`
 	// ServersUpgraded contains the servers that have been upgraded
 	ServersUpgraded []UpgradeStatusServer `json:"servers_upgraded"`
 	// ServersRemaining contains the servers that have not yet been upgraded

service/upgrade_manager.go

@@ -117,6 +117,8 @@ type UpgradePlan struct {
 	Entries         []UpgradePlanEntry `json:"entries"`
 	FinishedEntries []UpgradePlanEntry `json:"finished_entries"`
 	Finished        bool               `json:"finished"`
+	FromVersions    []driver.Version   `json:"from_versions"`
+	ToVersion       driver.Version     `json:"to_version"`
 }
 
 // IsReady returns true when all entries have finished.
@@ -224,6 +226,13 @@ func (m *upgradeManager) StartDatabaseUpgrade(ctx context.Context, force bool) e
 	if err != nil {
 		return maskAny(err)
 	}
+	if len(binaryDBVersions) > 1 {
+		return maskAny(client.NewBadRequestError(fmt.Sprintf("Found multiple database versions (%v). Make sure all machines have the same version", binaryDBVersions)))
+	}
+	if len(binaryDBVersions) == 0 {
+		return maskAny(client.NewBadRequestError("Found no database versions. This is likely a bug"))
+	}
+	toVersion := binaryDBVersions[0]
 
 	// Fetch (running) database versions of all starters
 	runningDBVersions, err := m.fetchRunningDatabaseVersions(ctx)
@@ -233,10 +242,8 @@ func (m *upgradeManager) StartDatabaseUpgrade(ctx context.Context, force bool) e
 
 	// Check if we can upgrade from running to binary versions
 	for _, from := range runningDBVersions {
-		for _, to := range binaryDBVersions {
-			if err := upgraderules.CheckUpgradeRules(from, to); err != nil {
-				return maskAny(errors.Wrap(err, "Found incompatible upgrade versions"))
-			}
+		if err := upgraderules.CheckUpgradeRules(from, toVersion); err != nil {
+			return maskAny(errors.Wrap(err, "Found incompatible upgrade versions"))
 		}
 	}
 
@@ -292,6 +299,8 @@ func (m *upgradeManager) StartDatabaseUpgrade(ctx context.Context, force bool) e
 	plan = UpgradePlan{
 		CreatedAt:      time.Now(),
 		LastModifiedAt: time.Now(),
+		FromVersions:   runningDBVersions,
+		ToVersion:      toVersion,
 	}
 	// First add all agents
 	for _, p := range config.AllPeers {
@@ -488,8 +497,10 @@ func (m *upgradeManager) Status(ctx context.Context) (client.UpgradeStatus, erro
 		return client.UpgradeStatus{}, maskAny(err)
 	}
 	result := client.UpgradeStatus{
-		Ready:  plan.IsReady(),
-		Failed: plan.IsFailed(),
+		Ready:        plan.IsReady(),
+		Failed:       plan.IsFailed(),
+		FromVersions: plan.FromVersions,
+		ToVersion:    plan.ToVersion,
 	}
 	for _, entry := range plan.Entries {
 		if entry.Failures > 0 && result.Reason == "" {

upgrade.go

@@ -122,16 +122,31 @@ func runUpgrade(starterEndpoint string, force, retry bool) {
 	// Create starter client
 	c := mustCreateStarterClient(starterEndpoint)
 	ctx := context.Background()
+	var action string
 	if retry {
 		if err := c.RetryDatabaseUpgrade(ctx); err != nil {
 			log.Fatal().Err(err).Msg("Failed to retry database automatic upgrade")
 		}
-		log.Info().Msg("Database automatic upgrade has been restarted")
+		action = "restarted"
 	} else {
 		if err := c.StartDatabaseUpgrade(ctx, force); err != nil {
 			log.Fatal().Err(err).Msg("Failed to start database automatic upgrade")
 		}
-		log.Info().Msg("Database automatic upgrade has been started")
+		action = "started"
+	}
+	status, err := c.UpgradeStatus(ctx)
+	if err != nil {
+		log.Info().Msgf("Database automatic upgrade has been %s", action)
+	} else {
+		fromVersions := make([]string, 0, len(status.FromVersions))
+		for _, v := range status.FromVersions {
+			fromVersions = append(fromVersions, string(v))
+		}
+		fromVersionPrefix := "version"
+		if len(status.FromVersions) > 1 {
+			fromVersionPrefix = "versions"
+		}
+		log.Info().Msgf("Database automatic upgrade from %s %s to version %s has been %s", fromVersionPrefix, strings.Join(fromVersions, ", "), status.ToVersion, action)
 	}
 
 	// Wait for the upgrade to finish