Merge pull request #499 from spotahome/error-messages

Fix error messages and handling

Author: ese

.github/workflows/ci.yaml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.19
       - run: make ci-unit-test
 
   integration-test:
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.19
       - name: Install conntrack
         run: sudo apt-get install -y conntrack
       - uses: medyagh/[email protected]

docker/app/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.17-alpine AS build
+FROM --platform=$BUILDPLATFORM golang:1.19-alpine AS build
 RUN apk --no-cache add \
   bash
 

docker/development/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.17-alpine
+FROM golang:1.19-alpine
 
 ENV CODEGEN_VERSION="1.11.9"
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/spotahome/redis-operator
 
-go 1.17
+go 1.19
 
 require (
 	github.com/go-redis/redis/v8 v8.11.5

go.sum

@@ -82,12 +82,12 @@ func (s *ServiceService) UpdateService(namespace string, service *corev1.Service
 }
 func (s *ServiceService) CreateOrUpdateService(namespace string, service *corev1.Service) error {
 	storedService, err := s.GetService(namespace, service.Name)
-	log.Errorf("Error while getting service %v in %v namespace : %v", service.GetName(), namespace, err)
 	if err != nil {
 		// If no resource we need to create.
 		if errors.IsNotFound(err) {
 			return s.CreateService(namespace, service)
 		}
+		log.Errorf("Error while updating service %v in %v namespace : %v", service.GetName(), namespace, err)
 		return err
 	}
 

service/k8s/service.go

@@ -173,12 +173,12 @@ func (c *client) GetSlaveOf(ip, port, password string) (string, error) {
 	info, err := rClient.Info(context.TODO(), "replication").Result()
 	if err != nil {
 		c.metricsRecorder.RecordRedisOperation(metrics.KIND_REDIS, ip, metrics.GET_SLAVE_OF, metrics.FAIL, getRedisError(err))
+		log.Errorf("error while getting masterIP : Failed to get info replication while querying redis instance %v", ip)
 		return "", err
 	}
 	match := redisMasterHostRE.FindStringSubmatch(info)
 	if len(match) == 0 {
-		c.metricsRecorder.RecordRedisOperation(metrics.KIND_REDIS, ip, metrics.GET_SLAVE_OF, metrics.FAIL, metrics.REGEX_NOT_FOUND)
-		log.Errorf("error while getting masterIP : No match for for %v while querying redis instance %v for replication info", redisMasterHostREString, ip)
+		c.metricsRecorder.RecordRedisOperation(metrics.KIND_REDIS, ip, metrics.GET_SLAVE_OF, metrics.SUCCESS, metrics.NOT_APPLICABLE)
 		return "", nil
 	}
 	c.metricsRecorder.RecordRedisOperation(metrics.KIND_REDIS, ip, metrics.GET_SLAVE_OF, metrics.SUCCESS, metrics.NOT_APPLICABLE)