fix

apecloud · Oct 17, 2024 · 1e251ae · 1e251ae
1 parent ae9bdf7
commit 1e251ae
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/addons/mysql/config/mysql5.7-config-constraint.cue b/addons/mysql/config/mysql5.7-config-constraint.cue
@@ -314,7 +314,7 @@
 	innodb_buffer_pool_load_now?: bool & true | false | *false
 
 	// The size in bytes of the buffer pool, the memory area where InnoDB caches table and index data.
-	innodb_buffer_pool_size?: int | *134217728
+	innodb_buffer_pool_size?: int & >=5242880 & <=18446744073709551615 @k8sResource(quantity)
 
 	// Maximum size for the InnoDBchange buffer, as a percentage of the total size of the buffer pool.
 	innodb_change_buffer_max_size?: int & >= 0 & <= 50 | *25

diff --git a/addons/mysql/config/mysql5.7-config.tpl b/addons/mysql/config/mysql5.7-config.tpl
@@ -49,7 +49,7 @@ thread_stack={{ $thread_stack }}
 thread_cache_size=60
 # ulimit -n
 open_files_limit=1048576
-local_infile=ON
+local_infile=true
 sql_mode=NO_ENGINE_SUBSTITUTION
 #Default 4000
 table_open_cache=4000
@@ -87,11 +87,11 @@ log_error_verbosity=2
 log_output=FILE
 {{- if hasKey $.component "enabledLogs" }}
 {{- if mustHas "slow" $.component.enabledLogs }}
-slow_query_log=ON
+slow_query_log=true
 long_query_time=5
 {{- end }}
 {{- if mustHas "general" $.component.enabledLogs }}
-general_log=ON
+general_log=true
 {{- end }}
 {{- end }}
 {{ end }}
@@ -116,16 +116,16 @@ key_buffer_size=16777216
 binlog_cache_size={{ $binlog_cache_size }}
 # AWS binlog_format=MIXED, Aliyun is ROW
 binlog_format=MIXED
-binlog_row_image=FULL
+binlog_row_image=full
 # Aliyun AWS binlog_order_commits=ON
-binlog_order_commits=ON
+binlog_order_commits=true
 log-bin={{ $data_root }}/binlog/mysql-bin
 log_bin_index={{ $data_root }}/binlog/mysql-bin.index
 expire_logs_days=7
 max_binlog_size=134217728
 # binlog_rows_query_log_events=ON #AWS not set
 # binlog_transaction_dependency_tracking=WRITESET    #Default Commit Order, Aws not set
-log_slave_updates=ON
+log_slave_updates=true
 
 # audit log
 loose_audit_log_handler=FILE # FILE, SYSLOG

diff --git a/addons/mysql/templates/clusterversion.yaml b/addons/mysql/templates/clusterversion.yaml
@@ -11,7 +11,7 @@ spec:
     configSpecs:
       - name: mysql-replication-config
         templateRef: oracle-mysql5.7-config-template
-        constraintRef: oracle-mysql8.0-config-constraints
+        constraintRef: oracle-mysql5.7-config-constraints
         volumeName: mysql-config
         namespace: {{ .Release.Namespace }}
       - name: agamotto-configuration

diff --git a/addons/mysql/templates/cmpd-mysql57.yaml b/addons/mysql/templates/cmpd-mysql57.yaml
@@ -11,7 +11,7 @@ spec:
   configs:
     - name: mysql-replication-config
       templateRef: oracle-mysql5.7-config-template
-      constraintRef: oracle-mysql8.0-config-constraints
+      constraintRef: oracle-mysql5.7-config-constraints
       volumeName: mysql-config
       namespace: {{ .Release.Namespace }}
       reRenderResourceTypes: