Special upgrade without ResignLeadership (#295)

Author: neunhoef

CHANGELOG.md

@@ -3,6 +3,8 @@
 ## [master](https://github.com/arangodb-helper/arangodb/tree/master) (N/A)
 - Allow to pass environment variables to processes and standardize argument pass (--envs.<group>.<ENV>=<VALUE> and --args.<group>.<ARG>=<VALUE>)
 - Extend JWT Generator functionality by additional fields
+- Do not run ResignLeadership when upgrading from <= 3.6.14 or 
+  3.7 with <= 3.7.12.
 
 # ArangoDB Starter Changelog Before 0.15.0
 

pkg/definitions/server_type.go

@@ -31,14 +31,15 @@ import (
 type ServerType string
 
 const (
-	ServerTypeUnknown         = "unknown"
-	ServerTypeCoordinator     = "coordinator"
-	ServerTypeDBServer        = "dbserver"
-	ServerTypeAgent           = "agent"
-	ServerTypeSingle          = "single"
-	ServerTypeResilientSingle = "resilientsingle"
-	ServerTypeSyncMaster      = "syncmaster"
-	ServerTypeSyncWorker      = "syncworker"
+	ServerTypeUnknown          = "unknown"
+	ServerTypeCoordinator      = "coordinator"
+	ServerTypeDBServer         = "dbserver"
+	ServerTypeDBServerNoResign = "dbserver_noresign"
+	ServerTypeAgent            = "agent"
+	ServerTypeSingle           = "single"
+	ServerTypeResilientSingle  = "resilientsingle"
+	ServerTypeSyncMaster       = "syncmaster"
+	ServerTypeSyncWorker       = "syncworker"
 )
 
 // String returns a string representation of the given ServerType.
@@ -51,7 +52,7 @@ func (s ServerType) PortOffset() int {
 	switch s {
 	case ServerTypeCoordinator, ServerTypeSingle, ServerTypeResilientSingle:
 		return PortOffsetCoordinator
-	case ServerTypeDBServer:
+	case ServerTypeDBServer, ServerTypeDBServerNoResign:
 		return PortOffsetDBServer
 	case ServerTypeAgent:
 		return PortOffsetAgent
@@ -93,7 +94,7 @@ func (s ServerType) ExpectedServerRole() (string, string) {
 		return "SINGLE", ""
 	case ServerTypeResilientSingle:
 		return "SINGLE", "resilient"
-	case ServerTypeDBServer:
+	case ServerTypeDBServer, ServerTypeDBServerNoResign:
 		return "PRIMARY", ""
 	case ServerTypeAgent:
 		return "AGENT", ""
@@ -111,6 +112,8 @@ func (s ServerType) GetName() string {
 		return "agent"
 	case ServerTypeDBServer:
 		return "dbserver"
+	case ServerTypeDBServerNoResign:
+		return "dbserver"
 	case ServerTypeCoordinator:
 		return "coordinator"
 	case ServerTypeSingle, ServerTypeResilientSingle:
@@ -128,6 +131,7 @@ func AllServerTypes() []ServerType {
 	return []ServerType{
 		ServerTypeCoordinator,
 		ServerTypeDBServer,
+		ServerTypeDBServerNoResign,
 		ServerTypeAgent,
 		ServerTypeSingle,
 		ServerTypeResilientSingle,

service/runtime_server_manager.go

@@ -513,6 +513,8 @@ func (s *runtimeServerManager) RestartServer(log zerolog.Logger, serverType defi
 		p = s.agentProc.Process()
 	case definitions.ServerTypeDBServer:
 		p = s.dbserverProc.Process()
+	case definitions.ServerTypeDBServerNoResign:
+		p = s.dbserverProc.Process()
 	case definitions.ServerTypeCoordinator:
 		p = s.coordinatorProc.Process()
 	case definitions.ServerTypeSingle, definitions.ServerTypeResilientSingle:

service/upgrade_manager.go

@@ -33,7 +33,7 @@ import (
 
 	"github.com/arangodb-helper/arangodb/pkg/definitions"
 
-	driver "github.com/arangodb/go-driver"
+	"github.com/arangodb/go-driver"
 	"github.com/arangodb/go-driver/agency"
 	upgraderules "github.com/arangodb/go-upgrade-rules"
 	"github.com/pkg/errors"
@@ -171,10 +171,11 @@ const (
 // UpgradePlanEntry is the JSON structure that describes a single entry
 // in an upgrade plan.
 type UpgradePlanEntry struct {
-	PeerID   string           `json:"peer_id"`
-	Type     UpgradeEntryType `json:"type"`
-	Failures int              `json:"failures,omitempty"`
-	Reason   string           `json:"reason,omitempty"`
+	PeerID        string           `json:"peer_id"`
+	Type          UpgradeEntryType `json:"type"`
+	Failures      int              `json:"failures,omitempty"`
+	Reason        string           `json:"reason,omitempty"`
+	WithoutResign bool             `json:"withoutResign,omitempty"`
 }
 
 // CreateStatusServer creates a UpgradeStatusServer for the given entry.
@@ -255,6 +256,7 @@ func (m *upgradeManager) StartDatabaseUpgrade(ctx context.Context, forceMinorUpg
 
 	// Check if we can upgrade from running to binary versions
 	specialUpgradeFrom346 := false
+	specialUpgradeFrom3614 := false
 	rules := upgraderules.CheckUpgradeRules
 	if forceMinorUpgrade {
 		rules = upgraderules.CheckSoftUpgradeRules
@@ -267,6 +269,9 @@ func (m *upgradeManager) StartDatabaseUpgrade(ctx context.Context, forceMinorUpg
 		if from.CompareTo("3.4.6") == 0 {
 			specialUpgradeFrom346 = true
 		}
+		if IsSpecialUpgradeFrom3614(from) {
+			specialUpgradeFrom3614 = true
+		}
 	}
 
 	// Fetch mode
@@ -403,8 +408,9 @@ func (m *upgradeManager) StartDatabaseUpgrade(ctx context.Context, forceMinorUpg
 		for _, p := range config.AllPeers {
 			if p.HasDBServer() {
 				plan.Entries = append(plan.Entries, UpgradePlanEntry{
-					Type:   UpgradeEntryTypeDBServer,
-					PeerID: p.ID,
+					Type:          UpgradeEntryTypeDBServer,
+					PeerID:        p.ID,
+					WithoutResign: specialUpgradeFrom3614,
 				})
 			}
 		}
@@ -993,7 +999,10 @@ func (m *upgradeManager) processUpgradePlan(ctx context.Context, plan UpgradePla
 		m.upgradeServerType = definitions.ServerTypeDBServer
 		m.updateNeeded = true
 		upgrade := func() error {
-			if err := m.upgradeManagerContext.RestartServer(definitions.ServerTypeDBServer); err != nil {
+			if firstEntry.WithoutResign {
+				fmt.Printf("Without resign")
+			}
+			if err := m.upgradeManagerContext.RestartServer(definitions.ServerTypeDBServerNoResign); err != nil {
 				return recordFailure(errors.Wrap(err, "Failed to restart dbserver"))
 			}
 
@@ -1572,3 +1581,9 @@ func (m *upgradeManager) ShowArangodServerVersions(ctx context.Context) (bool, e
 
 	return len(versions) == 1, nil
 }
+
+// IsSpecialUpgradeFrom3614 determines if special case for upgrade is required
+func IsSpecialUpgradeFrom3614(v driver.Version) bool {
+	return (v.CompareTo("3.6.0") >= 0 && v.CompareTo("3.6.14") <= 0) ||
+		(v.CompareTo("3.7.0") >= 0 && v.CompareTo("3.7.12") <= 0)
+}

test/process_cluster_resign_leadership_test.go

@@ -30,6 +30,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/arangodb-helper/arangodb/service"
+
 	"github.com/arangodb-helper/arangodb/client"
 	"github.com/arangodb/go-driver"
 	"github.com/pkg/errors"
@@ -80,13 +82,21 @@ func TestProcessClusterResignLeadership(t *testing.T) {
 		t.Fatal(err.Error())
 	}
 
+	WaitUntilServiceReadyAPI(t, coordinatorClient, ServiceReadyCheckVersion()).ExecuteT(t, 15*time.Second, 500*time.Millisecond)
+
+	if version, err := coordinatorClient.Version(context.Background()); err != nil {
+		t.Fatal(err.Error())
+	} else {
+		t.Log("Found version: ", version.Version)
+		if service.IsSpecialUpgradeFrom3614(version.Version) {
+			t.Skipf("ResignLeadership wont work in case when Maintenance is enabled")
+		}
+	}
+
 	databaseName := "_system"
 	collectionName := "test"
 
-	WaitUntilServiceReadyAPI(t, coordinatorClient, func(t *testing.T, ctx context.Context, c driver.Client) error {
-		_, err := coordinatorClient.Database(context.Background(), databaseName)
-		return err
-	}).ExecuteT(t, 15*time.Second, 500*time.Millisecond)
+	WaitUntilServiceReadyAPI(t, coordinatorClient, ServiceReadyCheckDatabase(databaseName)).ExecuteT(t, 15*time.Second, 500*time.Millisecond)
 
 	database, err := coordinatorClient.Database(context.Background(), databaseName)
 	if err != nil {

test/util.go

@@ -265,6 +265,22 @@ func WaitUntilServiceReady(t *testing.T, c driver.Client, checkFunc ServiceReady
 	}
 }
 
+// ServiceReadyCheckVersion checks if version can be fetched
+func ServiceReadyCheckVersion() ServiceReadyCheckFunc {
+	return func(t *testing.T, ctx context.Context, c driver.Client) error {
+		_, err := c.Version(ctx)
+		return err
+	}
+}
+
+// ServiceReadyCheckDatabase checks if database info can be fetched
+func ServiceReadyCheckDatabase(databaseName string) ServiceReadyCheckFunc {
+	return func(t *testing.T, ctx context.Context, c driver.Client) error {
+		_, err := c.Database(ctx, databaseName)
+		return err
+	}
+}
+
 func WaitForHttpPortClosed(log Logger, throttle Throttle, url string) TimeoutFunc {
 	return func() error {
 		_, err := http.Get(url)