cluster: major upgrade procedure (#51)

Fixes #51
scylladb · Dec 10, 2020 · 04bf0f6 · 04bf0f6
1 parent 78a9f6f
commit 04bf0f6
Show file tree

Hide file tree

Showing 21 changed files with 1,734 additions and 150 deletions.
diff --git a/config/operator/crd/bases/scylla.scylladb.com_scyllaclusters.yaml b/config/operator/crd/bases/scylla.scylladb.com_scyllaclusters.yaml
@@ -1618,6 +1618,27 @@ spec:
                 - name
                 type: object
               type: array
+            upgrade:
+              properties:
+                currentNode:
+                  type: string
+                currentRack:
+                  type: string
+                dataSnapshotTag:
+                  type: string
+                fromVersion:
+                  type: string
+                state:
+                  type: string
+                systemSnapshotTag:
+                  type: string
+                toVersion:
+                  type: string
+              required:
+              - fromVersion
+              - state
+              - toVersion
+              type: object
           type: object
       type: object
   version: v1alpha1

diff --git a/examples/common/operator.yaml b/examples/common/operator.yaml
@@ -1633,6 +1633,27 @@ spec:
                 - name
                 type: object
               type: array
+            upgrade:
+              properties:
+                currentNode:
+                  type: string
+                currentRack:
+                  type: string
+                dataSnapshotTag:
+                  type: string
+                fromVersion:
+                  type: string
+                state:
+                  type: string
+                systemSnapshotTag:
+                  type: string
+                toVersion:
+                  type: string
+              required:
+              - fromVersion
+              - state
+              - toVersion
+              type: object
           type: object
       type: object
   version: v1alpha1

diff --git a/pkg/api/v1alpha1/cluster_types.go b/pkg/api/v1alpha1/cluster_types.go
@@ -225,6 +225,17 @@ type ClusterStatus struct {
 	ManagerID *string               `json:"managerId,omitempty"`
 	Repairs   []RepairTaskStatus    `json:"repairs,omitempty"`
 	Backups   []BackupTaskStatus    `json:"backups,omitempty"`
+	Upgrade   *UpgradeStatus        `json:"upgrade,omitempty"`
+}
+
+type UpgradeStatus struct {
+	State             string `json:"state"`
+	CurrentNode       string `json:"currentNode,omitempty"`
+	CurrentRack       string `json:"currentRack,omitempty"`
+	FromVersion       string `json:"fromVersion"`
+	ToVersion         string `json:"toVersion"`
+	SystemSnapshotTag string `json:"systemSnapshotTag,omitempty"`
+	DataSnapshotTag   string `json:"dataSnapshotTag,omitempty"`
 }
 
 // RackStatus is the status of a Scylla Rack

diff --git a/pkg/api/v1alpha1/cluster_validation.go b/pkg/api/v1alpha1/cluster_validation.go
@@ -60,19 +60,6 @@ func checkValues(c *ScyllaCluster) error {
 }
 
 func checkTransitions(old, new *ScyllaCluster) error {
-	oldVersion, err := semver.Parse(old.Spec.Version)
-	if err != nil {
-		return errors.Errorf("invalid old semantic version, err=%s", err)
-	}
-	newVersion, err := semver.Parse(new.Spec.Version)
-	if err != nil {
-		return errors.Errorf("invalid new semantic version, err=%s", err)
-	}
-	// Check that version remained the same
-	if newVersion.Major != oldVersion.Major || newVersion.Minor != oldVersion.Minor {
-		return errors.Errorf("only upgrading of patch versions are supported")
-	}
-
 	// Check that repository remained the same
 	if !reflect.DeepEqual(old.Spec.Repository, new.Spec.Repository) {
 		return errors.Errorf("repository change is currently not supported, old=%v, new=%v", *old.Spec.Repository, *new.Spec.Repository)

diff --git a/pkg/api/v1alpha1/cluster_validation_test.go b/pkg/api/v1alpha1/cluster_validation_test.go
@@ -70,13 +70,13 @@ func TestCheckTransitions(t *testing.T) {
 			name:    "major version changed",
 			old:     unit.NewSingleRackCluster(3),
 			new:     unit.NewDetailedSingleRackCluster("test-cluster", "test-ns", "repo", "3.3.1", "test-dc", "test-rack", 3),
-			allowed: false,
+			allowed: true,
 		},
 		{
 			name:    "minor version changed",
 			old:     unit.NewSingleRackCluster(3),
 			new:     unit.NewDetailedSingleRackCluster("test-cluster", "test-ns", "repo", "2.4.2", "test-dc", "test-rack", 3),
-			allowed: false,
+			allowed: true,
 		},
 		{
 			name:    "patch version changed",

diff --git a/pkg/controllers/cluster/actions/export_test.go b/pkg/controllers/cluster/actions/export_test.go
@@ -0,0 +1,5 @@
+// Copyright (C) 2017 ScyllaDB
+
+package actions
+
+type CQLSession = cqlSession
diff --git a/pkg/controllers/cluster/actions/main_integration_test.go b/pkg/controllers/cluster/actions/main_integration_test.go
@@ -0,0 +1,99 @@
+// +build integration
+
+// Copyright (C) 2017 ScyllaDB
+
+package actions_test
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/go-logr/zapr"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	"github.com/pkg/errors"
+	"github.com/scylladb/go-log"
+	"github.com/scylladb/scylla-operator/pkg/cmd/options"
+	"github.com/scylladb/scylla-operator/pkg/controllers/cluster"
+	"github.com/scylladb/scylla-operator/pkg/test/integration"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+	"k8s.io/klog"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
+)
+
+var (
+	testEnv *integration.TestEnvironment
+	ctx     = context.Background()
+)
+
+const (
+	retryInterval = 200 * time.Millisecond
+	timeout       = 30 * time.Second
+)
+
+func TestMain(m *testing.M) {
+	ctx := log.WithNewTraceID(context.Background())
+	atom := zap.NewAtomicLevelAt(zapcore.DebugLevel)
+	logger, _ := log.NewProduction(log.Config{
+		Level: atom,
+	})
+	zlogger, _ := zap.NewDevelopment()
+	ctrl.SetLogger(zapr.NewLogger(zlogger))
+	klog.InitFlags(nil)
+	klog.SetOutput(os.Stdout)
+
+	logger.Info(ctx, "Creating test environment")
+	var err error
+	testEnv, err = integration.NewTestEnvironment(logger.Named("env"),
+		integration.WithPollRetryInterval(retryInterval),
+		integration.WithPollTimeout(timeout),
+	)
+	if err != nil {
+		panic(err)
+	}
+
+	logger.Info(ctx, "Starting test manager")
+	go func() {
+		if err := testEnv.StartManager(ctx); err != nil {
+			panic(fmt.Sprintf("Failed to start the envtest manager: %v", err))
+		}
+	}()
+
+	options.GetOperatorOptions().Image = "scylladb/scylla-operator"
+	defer func() {
+		options.GetOperatorOptions().Image = ""
+	}()
+
+	reconciler, err := cluster.New(ctx, testEnv.Manager, logger)
+	if err != nil {
+		panic(errors.Wrap(err, "create cluster reconciler"))
+	}
+	logger.Info(ctx, "Reconciler setup")
+	if err := reconciler.SetupWithManager(testEnv.Manager); err != nil {
+		panic(errors.Wrap(err, "setup cluster reconciler"))
+	}
+
+	logger.Info(ctx, "Starting tests")
+	// Run tests
+	code := m.Run()
+	logger.Info(ctx, "Tests done")
+	// Tearing down the test environment
+	if err := testEnv.Stop(); err != nil {
+		panic(fmt.Sprintf("Failed to stop the envtest: %v", err))
+	}
+
+	os.Exit(code)
+}
+
+func TestAPIs(t *testing.T) {
+	RegisterFailHandler(Fail)
+
+	RunSpecsWithDefaultAndCustomReporters(t,
+		"Controller Suite",
+		[]Reporter{printer.NewlineReporter{}})
+}