fix:codis proxy panic when helm pikacluster (OpenAtomFoundation#2632)

* fix:codis proxy panic when helm pikacluster --------- Co-authored-by: chejinge <[email protected]>
cheniujh · May 7, 2024 · 651426f · 651426f
1 parent 9dc205b
commit 651426f
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 22 deletions.
diff --git a/tools/kubeblocks_helm/pika/config/codis-dashboard.tpl b/tools/kubeblocks_helm/pika/config/codis-dashboard.tpl
@@ -8,10 +8,10 @@
 # Set Coordinator, only accept "zookeeper" & "etcd" & "filesystem".
 # for zookeeper/etcd, coorinator_auth accept "user:password" 
 # Quick Start
-#coordinator_name = "filesystem"
-#coordinator_addr = "/tmp/codis"
-coordinator_name = "etcd"
-coordinator_addr = "pika-cluster-etcd-0.pika-cluster-etcd-headless:2379,pika-cluster-etcd-1.pika-cluster-etcd-headless:2379,pika-cluster-etcd-1.pika-cluster-etcd-headless:2379"
+coordinator_name = "filesystem"
+coordinator_addr = "/tmp/codis"
+#coordinator_name = "zookeeper"
+#coordinator_addr = "127.0.0.1:2181"
 #coordinator_auth = ""
 
 # Set Codis Product Name/Auth.
@@ -36,11 +36,12 @@ migration_timeout = "30s"
 sentinel_check_server_state_interval = "10s"
 sentinel_check_master_failover_interval = "2s"
 sentinel_master_dead_check_times = 10
+sentinel_check_offline_server_interval = "2s"
 sentinel_client_timeout = "10s"
 sentinel_quorum = 2
 sentinel_parallel_syncs = 1
 sentinel_down_after = "30s"
 sentinel_failover_timeout = "5m"
 sentinel_notification_script = ""
 sentinel_client_reconfig_script = ""
-sentinel_check_offline_server_interval = "2s"
+
diff --git a/tools/kubeblocks_helm/pika/config/codis-proxy.tpl b/tools/kubeblocks_helm/pika/config/codis-proxy.tpl
@@ -68,8 +68,11 @@ backend_max_pipeline = 20480
 backend_primary_only = false
 
 # Set backend parallel connections per server
-backend_primary_parallel = 1
-backend_replica_parallel = 1
+backend_primary_parallel = 2
+backend_replica_parallel = 2
+# Set quick backend parallel connections per server
+backend_primary_quick = 1
+backend_replica_quick = 1
 
 # Set slot num
 max_slot_num = 1024
@@ -99,6 +102,14 @@ session_keepalive_period = "75s"
 # Set session to be sensitive to failures. Default is false, instead of closing socket, proxy will send an error response to client.
 session_break_on_failure = false
 
+# Slowlog-log-slower-than(us), from receive command to send response, 0 is allways print slow log
+slowlog_log_slower_than = 100000
+
+# quick command list e.g. get, set
+quick_cmd_list = ""
+# slow command list e.g. hgetall, mset
+slow_cmd_list = ""
+
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""
 metrics_report_period = "1s"
@@ -115,10 +126,6 @@ metrics_report_statsd_server = ""
 metrics_report_statsd_period = "1s"
 metrics_report_statsd_prefix = ""
 
+# Maximum delay statistical time interval.(This value must be greater than 0.)
 max_delay_refresh_time_interval = "15s"
-quick_cmd_list = ""
-slow_cmd_list = ""
-slowlog_log_slower_than = 10000
-backend_primary_quick = 1
-backend_replica_quick = 1
 
diff --git a/tools/kubeblocks_helm/pika/templates/componentdefinition-codis-dashboard.yaml b/tools/kubeblocks_helm/pika/templates/componentdefinition-codis-dashboard.yaml
@@ -8,7 +8,7 @@ spec:
   provider: pika
   description: A pika codis dashboard component definition
   serviceKind: pika-codis-dashboard
-  serviceVersion: 3.5.1
+  serviceVersion: 3.5.3
   services:
     - name: dashboard
       serviceName: dashboard

diff --git a/tools/kubeblocks_helm/pika/templates/componentdefinition-codis-fe.yaml b/tools/kubeblocks_helm/pika/templates/componentdefinition-codis-fe.yaml
@@ -8,7 +8,7 @@ spec:
   provider: pika
   description: A pika codis frontend component definition
   serviceKind: pika-codis-fe
-  serviceVersion: 3.5.1
+  serviceVersion: 3.5.3
   services:
     - name: fe
       serviceName: fe

diff --git a/tools/kubeblocks_helm/pika/templates/componentdefinition-codis-proxy.yaml b/tools/kubeblocks_helm/pika/templates/componentdefinition-codis-proxy.yaml
@@ -8,7 +8,7 @@ spec:
   provider: pika
   description: A pika codis proxy component definition
   serviceKind: pika-codis-proxy
-  serviceVersion: 3.5.1
+  serviceVersion: 3.5.3
   services:
     - name: proxy
       serviceName: proxy

diff --git a/tools/kubeblocks_helm/pika/templates/componentdefinition-pika-etcd.yaml b/tools/kubeblocks_helm/pika/templates/componentdefinition-pika-etcd.yaml
@@ -8,7 +8,7 @@ spec:
   provider: pika
   description: A pika etcd component definition
   serviceKind: pika-etcd
-  serviceVersion: 3.5.1
+  serviceVersion: 3.5.3
   services:
     - name: etcd
       serviceName: etcd

diff --git a/tools/kubeblocks_helm/pika/templates/componentdefinition-pika-group.yaml b/tools/kubeblocks_helm/pika/templates/componentdefinition-pika-group.yaml
@@ -8,7 +8,7 @@ spec:
   provider: pika
   description: A pika group component definition
   serviceKind: pika-group
-  serviceVersion: 3.5.1
+  serviceVersion: 3.5.3
   services:
     - name: pika
       serviceName: pika

diff --git a/tools/kubeblocks_helm/pika/values.yaml b/tools/kubeblocks_helm/pika/values.yaml
@@ -1,20 +1,20 @@
 pika:
-  version: v3.5.2
+  version: v3.5.3
 image:
   pika:
     registry: docker.io
     repository: pikadb/pika
-    tag: 3.5.2.0
+    tag: 3.5.3
     pullPolicy: IfNotPresent
   pikaExporter:
     registry: docker.io
     repository: pikadb/pika-exporter
-    tag: 3.5.2.0
+    tag: 3.5.3
     pullPolicy: IfNotPresent
   codis:
     registry: docker.io
     repository: pikadb/codis
-    tag: 3.5.2.0
+    tag: 3.5.3
     pullPolicy: IfNotPresent
   etcd:
     registry: docker.io
@@ -44,7 +44,7 @@ roleProbe:
     periodSeconds: 1
     timeoutSeconds: 1
 
-clusterVersionOverride: 3.5.2
+clusterVersionOverride: 3.5.3
 nameOverride: ""
 fullnameOverride: ""