Removed force flag

Author: ewoutp

client/api.go

@@ -51,7 +51,7 @@ type API interface {
 	Shutdown(ctx context.Context, goodbye bool) error
 
 	// StartDatabaseUpgrade is called to start the upgrade process
-	StartDatabaseUpgrade(ctx context.Context, force bool) error
+	StartDatabaseUpgrade(ctx context.Context) error
 
 	// RetryDatabaseUpgrade resets a failure mark in the existing upgrade plan
 	// such that the starters will retry the upgrade once more.

client/client.go

@@ -199,12 +199,8 @@ func (c *client) Shutdown(ctx context.Context, goodbye bool) error {
 }
 
 // StartDatabaseUpgrade is called to start the upgrade process
-func (c *client) StartDatabaseUpgrade(ctx context.Context, force bool) error {
-	q := url.Values{}
-	if force {
-		q.Set("force", "true")
-	}
-	url := c.createURL("/database-auto-upgrade", q)
+func (c *client) StartDatabaseUpgrade(ctx context.Context) error {
+	url := c.createURL("/database-auto-upgrade", nil)
 
 	req, err := http.NewRequest("POST", url, nil)
 	if err != nil {

service/server.go

@@ -617,11 +617,9 @@ func (s *httpServer) databaseAutoUpgradeHandler(w http.ResponseWriter, r *http.R
 	switch r.Method {
 	case "POST":
 		// Start the upgrade process
-		force, _ := strconv.ParseBool(r.FormValue("force"))
-
 		if isRunningMaster || mode.IsSingleMode() {
 			// We're the starter leader, process the request
-			if err := s.context.UpgradeManager().StartDatabaseUpgrade(ctx, force); err != nil {
+			if err := s.context.UpgradeManager().StartDatabaseUpgrade(ctx); err != nil {
 				handleError(w, err)
 			} else {
 				w.WriteHeader(http.StatusOK)
@@ -634,7 +632,7 @@ func (s *httpServer) databaseAutoUpgradeHandler(w http.ResponseWriter, r *http.R
 			if err != nil {
 				handleError(w, err)
 			} else {
-				if err := c.StartDatabaseUpgrade(ctx, force); err != nil {
+				if err := c.StartDatabaseUpgrade(ctx); err != nil {
 					s.log.Debug().Err(err).Msg("Forwarding StartDatabaseUpgrade failed")
 					handleError(w, err)
 				} else {

service/upgrade_manager.go

@@ -42,7 +42,7 @@ import (
 // UpgradeManager is the API of a service used to control the upgrade process from 1 database version to the next.
 type UpgradeManager interface {
 	// StartDatabaseUpgrade is called to start the upgrade process
-	StartDatabaseUpgrade(ctx context.Context, force bool) error
+	StartDatabaseUpgrade(ctx context.Context) error
 
 	// RetryDatabaseUpgrade resets a failure mark in the existing upgrade plan
 	// such that the starters will retry the upgrade once more.
@@ -212,7 +212,7 @@ type upgradeManager struct {
 }
 
 // StartDatabaseUpgrade is called to start the upgrade process
-func (m *upgradeManager) StartDatabaseUpgrade(ctx context.Context, force bool) error {
+func (m *upgradeManager) StartDatabaseUpgrade(ctx context.Context) error {
 	m.mutex.Lock()
 	defer m.mutex.Unlock()
 
@@ -297,7 +297,7 @@ func (m *upgradeManager) StartDatabaseUpgrade(ctx context.Context, force bool) e
 	}
 
 	// Check plan status
-	if !plan.IsReady() && !force {
+	if !plan.IsReady() {
 		return maskAny(client.NewBadRequestError("Current upgrade plan has not finished yet"))
 	}
 

upgrade.go

@@ -90,11 +90,11 @@ func init() {
 }
 
 func cmdUpgradeRun(cmd *cobra.Command, args []string) {
-	runUpgrade(upgradeOptions.starterEndpoint, false, false)
+	runUpgrade(upgradeOptions.starterEndpoint, false)
 }
 
 func cmdRetryUpgradeRun(cmd *cobra.Command, args []string) {
-	runUpgrade(retryUpgradeOptions.starterEndpoint, false, true)
+	runUpgrade(retryUpgradeOptions.starterEndpoint, true)
 }
 
 func cmdAbortUpgradeRun(cmd *cobra.Command, args []string) {
@@ -114,7 +114,7 @@ func cmdAbortUpgradeRun(cmd *cobra.Command, args []string) {
 	}
 }
 
-func runUpgrade(starterEndpoint string, force, retry bool) {
+func runUpgrade(starterEndpoint string, retry bool) {
 	// Setup logging
 	consoleOnly := true
 	configureLogging(consoleOnly)
@@ -129,7 +129,7 @@ func runUpgrade(starterEndpoint string, force, retry bool) {
 		}
 		action = "restarted"
 	} else {
-		if err := c.StartDatabaseUpgrade(ctx, force); err != nil {
+		if err := c.StartDatabaseUpgrade(ctx); err != nil {
 			log.Fatal().Err(err).Msg("Failed to start database automatic upgrade")
 		}
 		action = "started"