Merge branch 'feature/upgrade-plan' into feature/storage-engine-changes

Author: ewoutp

Makefile

@@ -58,7 +58,7 @@ ifdef TRAVIS
 	echo Using IP=$(IP)
 endif
 
-TEST_TIMEOUT := 20m
+TEST_TIMEOUT := 25m
 
 BINNAME := arangodb$(GOEXE)
 BIN := $(BINDIR)/$(GOOS)/$(GOARCH)/$(BINNAME)

client/api.go

@@ -51,12 +51,18 @@ 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.
 	RetryDatabaseUpgrade(ctx context.Context) error
 
+	// AbortDatabaseUpgrade removes the existing upgrade plan.
+	// Note that Starters working on an entry of the upgrade
+	// will finish that entry.
+	// If there is no plan, a NotFoundError will be returned.
+	AbortDatabaseUpgrade(ctx context.Context) error
+
 	// Status returns the status of any upgrade plan
 	UpgradeStatus(context.Context) (UpgradeStatus, error)
 }
@@ -134,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

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 {
@@ -247,6 +243,31 @@ func (c *client) RetryDatabaseUpgrade(ctx context.Context) error {
 	return nil
 }
 
+// AbortDatabaseUpgrade removes the existing upgrade plan.
+// Note that Starters working on an entry of the upgrade
+// will finish that entry.
+// If there is no plan, a NotFoundError will be returned.
+func (c *client) AbortDatabaseUpgrade(ctx context.Context) error {
+	url := c.createURL("/database-auto-upgrade", nil)
+
+	req, err := http.NewRequest("DELETE", url, nil)
+	if err != nil {
+		return maskAny(err)
+	}
+	if ctx != nil {
+		req = req.WithContext(ctx)
+	}
+	resp, err := c.client.Do(req)
+	if err != nil {
+		return maskAny(err)
+	}
+	if err := c.handleResponse(resp, "DELETE", url, nil); err != nil {
+		return maskAny(err)
+	}
+
+	return nil
+}
+
 // Status returns the status of any upgrade plan
 func (c *client) UpgradeStatus(ctx context.Context) (UpgradeStatus, error) {
 	url := c.createURL("/database-auto-upgrade", nil)

client/error.go

@@ -81,6 +81,11 @@ type ErrorResponse struct {
 	Error string
 }
 
+// IsNotFound returns true if the given error is caused by a NotFoundError.
+func IsNotFound(err error) bool {
+	return IsStatusErrorWithCode(err, http.StatusNotFound)
+}
+
 // IsServiceUnavailable returns true if the given error is caused by a ServiceUnavailableError.
 func IsServiceUnavailable(err error) bool {
 	return IsStatusErrorWithCode(err, http.StatusServiceUnavailable)
@@ -101,6 +106,11 @@ func IsInternalServer(err error) bool {
 	return IsStatusErrorWithCode(err, http.StatusInternalServerError)
 }
 
+// NewNotFoundError creates a not found error with given message.
+func NewNotFoundError(msg string) error {
+	return StatusError{StatusCode: http.StatusNotFound, message: msg}
+}
+
 // NewServiceUnavailableError creates a service unavailable error with given message.
 func NewServiceUnavailableError(msg string) error {
 	return StatusError{StatusCode: http.StatusServiceUnavailable, message: msg}