feat: ycsb support multiple addr (#70)

apecloud · May 20, 2024 · f0dff72 · f0dff72
1 parent 96046d3
commit f0dff72
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/api/v1alpha1/ycsb_types.go b/api/v1alpha1/ycsb_types.go
@@ -107,6 +107,7 @@ type YcsbSpec struct {
 	MasterName            string `json:"masterName,omitempty"`
 	RedisSentinelUsername string `json:"redisSentinelUsername,omitempty"`
 	RedisSentinelPassword string `json:"redisSentinelPassword,omitempty"`
+	RedisAddr             string `json:"redisAddr,omitempty"`
 
 	BenchCommon `json:",inline"`
 }

diff --git a/config/crd/bases/benchmark.apecloud.io_ycsbs.yaml b/config/crd/bases/benchmark.apecloud.io_ycsbs.yaml
@@ -75,6 +75,8 @@ spec:
                 default: 10000
                 minimum: 1
                 type: integer
+              redisAddr:
+                type: string
               redisMode:
                 type: string
               redisSentinelPassword:

diff --git a/deploy/helm/crds/benchmark.apecloud.io_ycsbs.yaml b/deploy/helm/crds/benchmark.apecloud.io_ycsbs.yaml
@@ -75,6 +75,8 @@ spec:
                 default: 10000
                 minimum: 1
                 type: integer
+              redisAddr:
+                type: string
               redisMode:
                 type: string
               redisSentinelPassword:

diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
@@ -9,7 +9,7 @@ image:
   pullPolicy: IfNotPresent
   registry: registry.cn-hangzhou.aliyuncs.com
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "0.0.8"
+  tag: "0.0.9"
 
 imagePullSecrets: []
 nameOverride: ""
@@ -91,5 +91,5 @@ kubebenchImages:
   ycsb: "registry.cn-hangzhou.aliyuncs.com/apecloud/go-ycsb:latest"
   fio: "registry.cn-hangzhou.aliyuncs.com/apecloud/fio:latest"
   redisbench: "registry.cn-hangzhou.aliyuncs.com/apecloud/redis:7.0.5"
-  exporter: "registry.cn-hangzhou.aliyuncs.com/apecloud/kubebench:0.0.6"
-  tools: "registry.cn-hangzhou.aliyuncs.com/apecloud/kubebench:0.0.6"
+  exporter: "registry.cn-hangzhou.aliyuncs.com/apecloud/kubebench:0.0.9"
+  tools: "registry.cn-hangzhou.aliyuncs.com/apecloud/kubebench:0.0.9"
diff --git a/internal/controller/ycsb_job.go b/internal/controller/ycsb_job.go
@@ -197,7 +197,12 @@ func NewYcsbMysqlParams(cr *v1alpha1.Ycsb) string {
 }
 
 func NewYcsbRedisParams(cr *v1alpha1.Ycsb) string {
-	result := fmt.Sprintf("-p redis.addr=%s", fmt.Sprintf("%s:%d", cr.Spec.Target.Host, cr.Spec.Target.Port))
+	result := ""
+	if cr.Spec.RedisAddr != "" {
+		result = fmt.Sprintf("-p redis.addr='%s'", cr.Spec.RedisAddr)
+	} else {
+		result = fmt.Sprintf("-p redis.addr='%s'", fmt.Sprintf("%s:%d", cr.Spec.Target.Host, cr.Spec.Target.Port))
+	}
 	if cr.Spec.Target.User != "" {
 		result = fmt.Sprintf("%s -p redis.username=%s", result, cr.Spec.Target.User)
 	}

diff --git a/pkg/constants/env.go b/pkg/constants/env.go
@@ -28,8 +28,8 @@ func init() {
 	viper.SetDefault(KubebenchEnvYcsb, "registry.cn-hangzhou.aliyuncs.com/apecloud/go-ycsb:latest")
 	viper.SetDefault(KubebenchEnvFio, "registry.cn-hangzhou.aliyuncs.com/apecloud/fio:latest")
 	viper.SetDefault(KubebenchEnvRedisBench, "registry.cn-hangzhou.aliyuncs.com/apecloud/redis:7.0.5")
-	viper.SetDefault(KubebenchExporter, "registry.cn-hangzhou.aliyuncs.com/apecloud/kubebench:0.0.6")
-	viper.SetDefault(KubebenchTools, "registry.cn-hangzhou.aliyuncs.com/apecloud/kubebench:0.0.6")
+	viper.SetDefault(KubebenchExporter, "registry.cn-hangzhou.aliyuncs.com/apecloud/kubebench:0.0.9")
+	viper.SetDefault(KubebenchTools, "registry.cn-hangzhou.aliyuncs.com/apecloud/kubebench:0.0.9")
 }
 
 // GetBenchmarkImage get benchmark image