mix of makefile and action

ndyakov · ndyakov · commit 0b6f328cfe9b · 2025-02-11T12:47:16.000+02:00
diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml
@@ -47,6 +47,5 @@ runs:
         RCE_DOCKER: "true"
         RE_CLUSTER: "false"
       run: |
-        go test ./... -short -race && \
-        go test -coverprofile=coverage.txt -covermode=atomic ./... && \
+        make test.ci
       shell: bash
diff --git a/Makefile b/Makefile
@@ -9,6 +9,12 @@ redisstackdocker.stop:
 
 test: testdeps
 	$(MAKE) redisstackdocker.start
+	$(MAKE) test.ci
+	$(MAKE) redisstackdocker.stop
+
+testdeps: testdata/redis/src/redis-server
+
+test.ci:
 	$(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 \
@@ -26,9 +32,6 @@ test: testdeps
 	done
 	cd internal/customvet && go build .
 	go vet -vettool ./internal/customvet/customvet
-	$(MAKE) redisstackdocker.stop
-
-testdeps: testdata/redis/src/redis-server
 
 bench:
 	go test ./... -test.run=NONE -test.bench=. -test.benchmem
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -82,6 +82,24 @@ services:
       - all-stack
       - all
 
+  sentinel-cluster:
+    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
+    container_name: redis-sentinel-cluster
+    environment:
+      - NODES=3
+      - TLS_ENABLED=yes
+      - REDIS_CLUSTER=no
+      - PORT=9121
+    command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --tls-auth-clients optional --save ""}
+    ports:
+      - "9121-9123:9121-9123"
+    volumes:
+      - "./dockers/sentinel-cluster:/redis/work"
+    profiles:
+      - sentinel
+      - all-stack
+      - all
+
   redisRing1:
     image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
     container_name: redis-ring-1
diff --git a/main_test.go b/main_test.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"net"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strconv"
 	"sync"
@@ -28,12 +27,12 @@ const (
 
 const (
 	sentinelName       = "go-redis-test"
-	sentinelMasterPort = "9123"
-	sentinelSlave1Port = "9124"
-	sentinelSlave2Port = "9125"
-	sentinelPort1      = "9126"
-	sentinelPort2      = "9127"
-	sentinelPort3      = "9128"
+	sentinelMasterPort = "9121"
+	sentinelSlave1Port = "9122"
+	sentinelSlave2Port = "9123"
+	sentinelPort1      = "26379"
+	sentinelPort2      = "26380"
+	sentinelPort3      = "26381"
 )
 
 var (
@@ -52,8 +51,8 @@ var (
 	processes map[string]*redisProcess
 
 	ringShard1, ringShard2, ringShard3             *redis.Client
-	sentinelMaster, sentinelSlave1, sentinelSlave2 *redisProcess
-	sentinel1, sentinel2, sentinel3                *redisProcess
+	sentinelMaster, sentinelSlave1, sentinelSlave2 *redis.Client
+	sentinel1, sentinel2, sentinel3                *redis.Client
 )
 
 var cluster = &clusterScenario{
@@ -118,7 +117,7 @@ var _ = BeforeSuite(func() {
 	}
 
 	if !RECluster && !RCEDocker {
-		sentinelMaster, err = startRedis(sentinelMasterPort)
+		sentinelMaster, err = connectTo(sentinelMasterPort)
 		Expect(err).NotTo(HaveOccurred())
 
 		sentinel1, err = startSentinel(sentinelPort1, sentinelName, sentinelMasterPort)
@@ -130,15 +129,14 @@ var _ = BeforeSuite(func() {
 		sentinel3, err = startSentinel(sentinelPort3, sentinelName, sentinelMasterPort)
 		Expect(err).NotTo(HaveOccurred())
 
-		sentinelSlave1, err = startRedis(
-			sentinelSlave1Port, "--slaveof", "127.0.0.1", sentinelMasterPort)
+		sentinelSlave1, err = connectTo(sentinelSlave1Port)
 		Expect(err).NotTo(HaveOccurred())
-
-		sentinelSlave2, err = startRedis(
-			sentinelSlave2Port, "--slaveof", "127.0.0.1", sentinelMasterPort)
+		err = sentinelSlave1.SlaveOf(ctx, "127.0.0.1", sentinelMasterPort).Err()
 		Expect(err).NotTo(HaveOccurred())
 
-		err = startCluster(ctx, cluster)
+		sentinelSlave2, err = connectTo(sentinelSlave2Port)
+		Expect(err).NotTo(HaveOccurred())
+		err = sentinelSlave2.SlaveOf(ctx, "127.0.0.1", sentinelMasterPort).Err()
 		Expect(err).NotTo(HaveOccurred())
 	} else {
 		redisPort = redisStackPort
@@ -154,6 +152,28 @@ var _ = BeforeSuite(func() {
 			ringShard3, err = connectTo(ringShard3Port)
 			Expect(err).NotTo(HaveOccurred())
 
+			sentinelMaster, err = connectTo(sentinelMasterPort)
+			Expect(err).NotTo(HaveOccurred())
+
+			sentinel1, err = startSentinel(sentinelPort1, sentinelName, sentinelMasterPort)
+			Expect(err).NotTo(HaveOccurred())
+
+			sentinel2, err = startSentinel(sentinelPort2, sentinelName, sentinelMasterPort)
+			Expect(err).NotTo(HaveOccurred())
+
+			sentinel3, err = startSentinel(sentinelPort3, sentinelName, sentinelMasterPort)
+			Expect(err).NotTo(HaveOccurred())
+
+			sentinelSlave1, err = connectTo(sentinelSlave1Port)
+			Expect(err).NotTo(HaveOccurred())
+			err = sentinelSlave1.SlaveOf(ctx, "127.0.0.1", sentinelMasterPort).Err()
+			Expect(err).NotTo(HaveOccurred())
+
+			sentinelSlave2, err = connectTo(sentinelSlave2Port)
+			Expect(err).NotTo(HaveOccurred())
+			err = sentinelSlave2.SlaveOf(ctx, "127.0.0.1", sentinelMasterPort).Err()
+			Expect(err).NotTo(HaveOccurred())
+
 			// populate cluster node information
 			Expect(configureClusterTopology(ctx, cluster)).NotTo(HaveOccurred())
 		}
@@ -310,15 +330,6 @@ func eventually(fn func() error, timeout time.Duration) error {
 	}
 }
 
-func execCmd(name string, args ...string) (*os.Process, error) {
-	cmd := exec.Command(name, args...)
-	if testing.Verbose() {
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-	}
-	return cmd.Process, cmd.Start()
-}
-
 func connectTo(port string) (*redis.Client, error) {
 	client := redis.NewClient(&redis.Options{
 		Addr:       ":" + port,
@@ -379,52 +390,9 @@ func redisDir(port string) (string, error) {
 	return dir, nil
 }
 
-func startRedis(port string, args ...string) (*redisProcess, error) {
-	dir, err := redisDir(port)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := exec.Command("cp", "-f", redisServerConf, dir).Run(); err != nil {
-		return nil, err
-	}
-
-	baseArgs := []string{filepath.Join(dir, "redis.conf"), "--port", port, "--dir", dir, "--enable-module-command", "yes"}
-	process, err := execCmd(redisServerBin, append(baseArgs, args...)...)
-	if err != nil {
-		return nil, err
-	}
-
-	client, err := connectTo(port)
-	if err != nil {
-		process.Kill()
-		return nil, err
-	}
-
-	p := &redisProcess{process, client}
-	registerProcess(port, p)
-	return p, nil
-}
-
-func startSentinel(port, masterName, masterPort string) (*redisProcess, error) {
-	dir, err := redisDir(port)
-	if err != nil {
-		return nil, err
-	}
-
-	sentinelConf := filepath.Join(dir, "sentinel.conf")
-	if err := os.WriteFile(sentinelConf, nil, 0o644); err != nil {
-		return nil, err
-	}
-
-	process, err := execCmd(redisServerBin, sentinelConf, "--sentinel", "--port", port, "--dir", dir)
-	if err != nil {
-		return nil, err
-	}
-
+func startSentinel(port, masterName, masterPort string) (*redis.Client, error) {
 	client, err := connectTo(port)
 	if err != nil {
-		process.Kill()
 		return nil, err
 	}
 
@@ -438,14 +406,11 @@ func startSentinel(port, masterName, masterPort string) (*redisProcess, error) {
 	} {
 		client.Process(ctx, cmd)
 		if err := cmd.Err(); err != nil {
-			process.Kill()
 			return nil, fmt.Errorf("%s failed: %w", cmd, err)
 		}
 	}
 
-	p := &redisProcess{process, client}
-	registerProcess(port, p)
-	return p, nil
+	return client, nil
 }
 
 //------------------------------------------------------------------------------
diff --git a/osscluster_test.go b/osscluster_test.go
@@ -226,20 +226,6 @@ func collectNodeInformation(ctx context.Context, scenario *clusterScenario) erro
 	return nil
 }
 
-// startCluster start a cluster
-func startCluster(ctx context.Context, scenario *clusterScenario) error {
-	// Start processes and collect node ids
-	for _, port := range scenario.ports {
-		process, err := startRedis(port, "--cluster-enabled", "yes")
-		if err != nil {
-			return err
-		}
-		scenario.processes[port] = process
-	}
-
-	return configureClusterTopology(ctx, scenario)
-}
-
 func assertSlotsEqual(slots, wanted []redis.ClusterSlot) error {
 outerLoop:
 	for _, s2 := range wanted {
diff --git a/sentinel_test.go b/sentinel_test.go
@@ -115,11 +115,13 @@ var _ = Describe("Sentinel", func() {
 		ch := pub.Channel()
 
 		// Kill master.
-		err = master.Shutdown(ctx).Err()
-		Expect(err).NotTo(HaveOccurred())
-		Eventually(func() error {
-			return master.Ping(ctx).Err()
-		}, "15s", "100ms").Should(HaveOccurred())
+		/*
+			err = master.Shutdown(ctx).Err()
+			Expect(err).NotTo(HaveOccurred())
+			Eventually(func() error {
+				return master.Ping(ctx).Err()
+			}, "15s", "100ms").Should(HaveOccurred())
+		*/
 
 		// Check that client picked up new master.
 		Eventually(func() string {
@@ -135,9 +137,6 @@ var _ = Describe("Sentinel", func() {
 		Expect(msg.Channel).To(Equal("foo"))
 		Expect(msg.Payload).To(Equal("hello"))
 		Expect(pub.Close()).NotTo(HaveOccurred())
-
-		_, err = startRedis(masterPort)
-		Expect(err).NotTo(HaveOccurred())
 	})
 
 	It("supports DB selection", func() {
@@ -258,11 +257,13 @@ var _ = Describe("NewFailoverClusterClient", func() {
 		ch := sub.Channel()
 
 		// Kill master.
-		err = master.Shutdown(ctx).Err()
-		Expect(err).NotTo(HaveOccurred())
-		Eventually(func() error {
-			return master.Ping(ctx).Err()
-		}, "15s", "100ms").Should(HaveOccurred())
+		/*
+			err = master.Shutdown(ctx).Err()
+			Expect(err).NotTo(HaveOccurred())
+			Eventually(func() error {
+				return master.Ping(ctx).Err()
+			}, "15s", "100ms").Should(HaveOccurred())
+		*/
 
 		// Check that client picked up new master.
 		Eventually(func() string {
@@ -279,8 +280,6 @@ var _ = Describe("NewFailoverClusterClient", func() {
 		Expect(msg.Payload).To(Equal("hello"))
 		Expect(sub.Close()).NotTo(HaveOccurred())
 
-		_, err = startRedis(masterPort)
-		Expect(err).NotTo(HaveOccurred())
 	})
 
 	It("should sentinel cluster client setname", func() {
@@ -317,8 +316,8 @@ var _ = Describe("SentinelAclAuth", func() {
 
 	var client *redis.Client
 	var sentinel *redis.SentinelClient
-	sentinels := func() []*redisProcess {
-		return []*redisProcess{sentinel1, sentinel2, sentinel3}
+	sentinels := func() []*redis.Client {
+		return []*redis.Client{sentinel1, sentinel2, sentinel3}
 	}
 
 	BeforeEach(func() {
@@ -328,7 +327,7 @@ var _ = Describe("SentinelAclAuth", func() {
 			"+sentinel|myid", "+sentinel|replicas", "+sentinel|sentinels")
 
 		for _, process := range sentinels() {
-			err := process.Client.Process(ctx, authCmd)
+			err := process.Process(ctx, authCmd)
 			Expect(err).NotTo(HaveOccurred())
 		}
 
@@ -364,7 +363,7 @@ var _ = Describe("SentinelAclAuth", func() {
 		unauthCommand := redis.NewStatusCmd(ctx, "ACL", "DELUSER", aclSentinelUsername)
 
 		for _, process := range sentinels() {
-			err := process.Client.Process(ctx, unauthCommand)
+			err := process.Process(ctx, unauthCommand)
 			Expect(err).NotTo(HaveOccurred())
 		}
 
