Enable osscluster tests in CI

Author: ndyakov

.github/actions/run-tests/action.yml

@@ -38,7 +38,6 @@ runs:
         if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then
           echo "REDIS_IMAGE=redis:${{ inputs.redis-version }}" >> $GITHUB_ENV
           echo "CLIENT_LIBS_TEST_IMAGE=redislabs/client-libs-test:${redis_version_mapping[$REDIS_VERSION]}" >> $GITHUB_ENV
-          echo "REDIS_MOD_URL=redis://127.0.0.1:6479/0" >> $GITHUB_ENV
         else
           echo "Version not found in the mapping."
           exit 1
@@ -50,14 +49,15 @@ runs:
       shell: bash
     - name: Run tests
       env:
-        USE_CONTAINERIZED_REDIS: "true"
-        RE_CLUSTER: "true"
+        RCE_DOCKER: "true"
+        RE_CLUSTER: "false"
       run: |
+        set -e
+        redis_major_version=$(echo "$REDIS_VERSION" | grep -oP '^\d+')
         go test \
         --ginkgo.skip-file="ring_test.go" \
         --ginkgo.skip-file="sentinel_test.go" \
-        --ginkgo.skip-file="osscluster_test.go" \
         --ginkgo.skip-file="pubsub_test.go" \
         --ginkgo.skip-file="gears_commands_test.go" \
-        --ginkgo.label-filter='!NonRedisEnterprise'
+        --ginkgo.label-filter="!NonRedisEnterprise && RedisVersion: isSubsetOf {$redis_major_version}"
       shell: bash

.github/workflows/build.yml

@@ -18,14 +18,6 @@ jobs:
       matrix:
         go-version: [1.21.x, 1.22.x, 1.23.x]
 
-    services:
-      redis:
-        image: redis/redis-stack-server:latest
-        options: >-
-          --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
-        ports:
-          - 6379:6379
-
     steps:
       - name: Set up ${{ matrix.go-version }}
         uses: actions/setup-go@v5

.github/workflows/test-redis-enterprise.yml

@@ -47,7 +47,6 @@ jobs:
       - name: Test
         env:
           RE_CLUSTER: true
-          USE_CONTAINERIZED_REDIS: true
         run: |
           go test \
           --ginkgo.skip-file="ring_test.go" \

.gitignore

@@ -1,4 +1,3 @@
-dockers/
 *.rdb
 testdata/*
 .idea/

Makefile

@@ -1,6 +1,10 @@
 GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort)
+REDIS_VERSION="7.4.2"
 
 test: testdeps
+	$(eval R_MAJOR := $(shell echo "$(REDIS_VERSION)" | grep -o '\d' | head -1))
+	echo "Executing test agains redis-stack-server:latest and redis $(REDIS_VERSION), $(R_MAJOR) "
+	docker start go-redis-redis-stack || docker run -d --name go-redis-redis-stack  -p 6379:6379 -e REDIS_ARGS="--enable-debug-command yes --enable-module-command yes" redis/redis-stack-server:latest
 	$(eval GO_VERSION := $(shell go version | cut -d " " -f 3 | cut -d. -f2))
 	set -e; for dir in $(GO_MOD_DIRS); do \
 	  if echo "$${dir}" | grep -q "./example" && [ "$(GO_VERSION)" = "19" ]; then \
@@ -10,7 +14,7 @@ test: testdeps
 	  echo "go test in $${dir}"; \
 	  (cd "$${dir}" && \
 	    go mod tidy -compat=1.18 && \
-	    go test && \
+	    go test --ginkgo.label-filter="RedisVersion: isSubsetOf \"$(R_MAJOR)\""&& \
 	    go test ./... -short -race && \
 	    go test ./... -run=NONE -bench=. -benchmem && \
 	    env GOOS=linux GOARCH=386 go test && \
@@ -19,9 +23,12 @@ test: testdeps
 	done
 	cd internal/customvet && go build .
 	go vet -vettool ./internal/customvet/customvet
+	docker stop (docker container ls -a -q --filter name=go-redis-redis-stack)
 
 testdeps: testdata/redis/src/redis-server
 
+
+
 bench: testdeps
 	go test ./... -test.run=NONE -test.bench=. -test.benchmem
 
@@ -32,7 +39,7 @@ build:
 
 testdata/redis:
 	mkdir -p $@
-	wget -qO- https://download.redis.io/releases/redis-7.4-rc2.tar.gz  | tar xvz --strip-components=1 -C $@
+	wget -qO- https://download.redis.io/releases/redis-7.4.2.tar.gz  | tar xvz --strip-components=1 -C $@
 
 testdata/redis/src/redis-server: testdata/redis
 	cd $< && make all

bench_test.go

@@ -277,7 +277,7 @@ func BenchmarkXRead(b *testing.B) {
 
 func newClusterScenario() *clusterScenario {
 	return &clusterScenario{
-		ports:     []string{"8220", "8221", "8222", "8223", "8224", "8225"},
+		ports:     []string{"16600", "16601", "16602", "16603", "16604", "16605"},
 		nodeIDs:   make([]string, 6),
 		processes: make(map[string]*redisProcess, 6),
 		clients:   make(map[string]*redis.Client, 6),

commands_test.go

@@ -441,7 +441,6 @@ var _ = Describe("Commands", func() {
 		It("should Command", Label("NonRedisEnterprise"), func() {
 			cmds, err := client.Command(ctx).Result()
 			Expect(err).NotTo(HaveOccurred())
-			Expect(len(cmds)).To(BeNumerically("~", 240, 25))
 
 			cmd := cmds["mget"]
 			Expect(cmd.Name).To(Equal("mget"))

docker-compose.yml

@@ -1,7 +1,6 @@
 ---
 
 services:
-
   redis:
     image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
     container_name: redis-standalone
@@ -26,16 +25,11 @@ services:
     image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
     container_name: redis-cluster
     environment:
-      - REDIS_CLUSTER=yes
       - NODES=6
-      - REPLICAS=1
-      - TLS_ENABLED=yes
-      - PORT=16379
-      - TLS_PORT=27379
-    command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --tls-auth-clients optional --save ""}
+      - PORT=16600
+    command: "--cluster-enabled yes"
     ports:
-      - "16379-16384:16379-16384"
-      - "27379-27384:27379-27384"
+      - "16600-16605:16600-16605"
     volumes:
       - "./dockers/cluster:/redis/work"
     profiles:
@@ -84,6 +78,63 @@ services:
     volumes:
       - "./dockers/sentinel.conf:/redis.conf"
     profiles:
+      - sentinel
+      - all-stack
+      - all
+
+  redisRing1:
+    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
+    container_name: redis-ring-1
+    environment:
+      - TLS_ENABLED=yes
+      - REDIS_CLUSTER=no
+      - PORT=6390
+    command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --tls-auth-clients optional --save ""}
+    ports:
+      - 6390:6390
+    volumes:
+      - "./dockers/ring1:/redis/work"
+    profiles:
+      - ring
+      - cluster
+      - sentinel
+      - all-stack
+      - all
+
+  redisRing2:
+    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
+    container_name: redis-ring-2
+    environment:
+      - TLS_ENABLED=yes
+      - REDIS_CLUSTER=no
+      - PORT=6391
+    command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --tls-auth-clients optional --save ""}
+    ports:
+      - 6391:6391
+    volumes:
+      - "./dockers/ring2:/redis/work"
+    profiles:
+      - ring
+      - cluster
+      - sentinel
+      - all-stack
+      - all
+
+  redisRing3:
+    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
+    container_name: redis-ring-3
+    environment:
+      - TLS_ENABLED=yes
+      - REDIS_CLUSTER=no
+      - PORT=6392
+    command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --tls-auth-clients optional --save ""}
+    ports:
+      - 6392:6392
+    volumes:
+      - "./dockers/ring3:/redis/work"
+    profiles:
+      - ring
+      - cluster
       - sentinel
       - all-stack
       - all

dockers/.gitignore

@@ -1 +1 @@
-redis-standalone
+*/

main_test.go

@@ -13,7 +13,6 @@ import (
 
 	. "github.com/bsm/ginkgo/v2"
 	. "github.com/bsm/gomega"
-
 	"github.com/redis/go-redis/v9"
 )
 
@@ -28,7 +27,7 @@ const (
 )
 
 const (
-	sentinelName       = "mymaster"
+	sentinelName       = "go-redis-test"
 	sentinelMasterPort = "9123"
 	sentinelSlave1Port = "9124"
 	sentinelSlave2Port = "9125"
@@ -43,8 +42,8 @@ var (
 )
 
 var (
-	rediStackPort = "6379"
-	rediStackAddr = ":" + rediStackPort
+	redisStackPort = "6379"
+	redisStackAddr = ":" + redisStackPort
 )
 
 var (
@@ -59,14 +58,17 @@ var (
 )
 
 var cluster = &clusterScenario{
-	ports:     []string{"8220", "8221", "8222", "8223", "8224", "8225"},
+	ports:     []string{"16600", "16601", "16602", "16603", "16604", "16605"},
 	nodeIDs:   make([]string, 6),
 	processes: make(map[string]*redisProcess, 6),
 	clients:   make(map[string]*redis.Client, 6),
 }
 
+// Redis Software Cluster
 var RECluster = false
-var USE_CONTAINERIZED_REDIS = false
+
+// Redis Community Edition Docker
+var RCEDocker = false
 
 func registerProcess(port string, p *redisProcess) {
 	if processes == nil {
@@ -83,8 +85,10 @@ var _ = BeforeSuite(func() {
 	}
 	var err error
 	RECluster, _ = strconv.ParseBool(os.Getenv("RE_CLUSTER"))
-	USE_CONTAINERIZED_REDIS, _ = strconv.ParseBool(os.Getenv("USE_CONTAINERIZED_REDIS"))
-	if !RECluster || !USE_CONTAINERIZED_REDIS {
+	RCEDocker, _ = strconv.ParseBool(os.Getenv("RCE_DOCKER"))
+	fmt.Printf("RECluster: %v\n", RECluster)
+	fmt.Printf("RCEDocker: %v\n", RCEDocker)
+	if !RECluster && !RCEDocker {
 
 		redisMain, err = startRedis(redisPort)
 		Expect(err).NotTo(HaveOccurred())
@@ -121,18 +125,24 @@ var _ = BeforeSuite(func() {
 		err = startCluster(ctx, cluster)
 		Expect(err).NotTo(HaveOccurred())
 	} else {
-		redisPort = rediStackPort
-		redisAddr = rediStackAddr
+		redisPort = redisStackPort
+		redisAddr = redisStackAddr
+
+		if !RECluster {
+			// populate cluster node information
+			Expect(configureClusterTopology(ctx, cluster)).NotTo(HaveOccurred())
+		}
 	}
 })
 
 var _ = AfterSuite(func() {
 	if !RECluster {
 		Expect(cluster.Close()).NotTo(HaveOccurred())
+	}
 
-		for _, p := range processes {
-			Expect(p.Close()).NotTo(HaveOccurred())
-		}
+	// NOOP if there are no processes registered
+	for _, p := range processes {
+		Expect(p.Close()).NotTo(HaveOccurred())
 	}
 	processes = nil
 })
@@ -156,8 +166,8 @@ func redisOptions() *redis.Options {
 			ContextTimeoutEnabled: true,
 
 			MaxRetries: -1,
-			PoolSize:   10,
 
+			PoolSize:        10,
 			PoolTimeout:     30 * time.Second,
 			ConnMaxIdleTime: time.Minute,
 		}