Merge pull request #406 from arangodb-helper/fix/sync-upgrade

Fix upgrade with ArangoSync component enabled

Author: jwierzbo

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 parameters:
   goImage:
     type: string
-    default: "gcr.io/gcr-for-testing/golang:1.21.6"
+    default: "gcr.io/gcr-for-testing/golang:1.21.8"
   arangodbImage:
     type: string
     default: "gcr.io/gcr-for-testing/arangodb/enterprise-preview:devel-nightly"
@@ -17,7 +17,7 @@ parameters:
 executors:
   golang-executor:
     docker:
-      - image: gcr.io/gcr-for-testing/golang:1.21.6
+      - image: gcr.io/gcr-for-testing/golang:1.21.8
   machine-executor:
     machine:
       image: ubuntu-2204:current

CHANGELOG.md

@@ -1,6 +1,8 @@
 # ArangoDB Starter Changelog
 
 ## [master](https://github.com/arangodb-helper/arangodb/tree/master) (N/A)
+- Fix upgrade with ArangoSync component enabled
+- Bump Go version (1.21.8) and dependencies for CVE fixes
 
 ## [v0.18.3](https://github.com/arangodb-helper/arangodb/tree/0.18.3) (2024-03-05)
 - Mark ArangoSync component as deprecated

Makefile

@@ -40,7 +40,7 @@ REPOPATH := $(ORGPATH)/$(REPONAME)
 ALPINE_IMAGE ?= alpine:3.18
 
 GOPATH := $(GOBUILDDIR)
-GOVERSION := 1.21.6
+GOVERSION := 1.21.8
 GOIMAGE ?= golang:$(GOVERSION)-alpine3.18
 
 GOOS ?= linux

service/upgrade_manager.go

@@ -296,7 +296,10 @@ func (m *upgradeManager) StartDatabaseUpgrade(ctx context.Context, forceMinorUpg
 	if mode.SupportsArangoSync() {
 		for _, p := range config.AllPeers {
 			if p.HasSyncMaster() || p.HasSyncWorker() {
-				return fmt.Errorf("upgrade version (%s) does not support ArangoSync component (member: %s, %s)", toVersion, p.ID, p.Address)
+				dbFeatures := NewDatabaseFeatures(toVersion, false)
+				if !dbFeatures.SupportsArangoSync() {
+					return fmt.Errorf("upgrade version (%s) does not support ArangoSync component (member: %s, %s)", toVersion, p.ID, p.Address)
+				}
 			}
 		}
 	}