fixes

Author: gkech

api/v1/autoconfig_defaults_test.go

@@ -18,17 +18,17 @@ func TestCheckNSetDefaultsAutoConfig(t *testing.T) {
 			wantLoadType: "",
 		},
 		"explicitly disabled keeps loadType unset": {
-			enabled:      ptr(false),
+			enabled:      new(false),
 			wantEnabled:  false,
 			wantLoadType: "",
 		},
 		"explicitly enabled without loadType gets default": {
-			enabled:      ptr(true),
+			enabled:      new(true),
 			wantEnabled:  true,
 			wantLoadType: AutoConfigLoadTypeSomeWrites,
 		},
 		"explicitly enabled with custom loadType is preserved": {
-			enabled:      ptr(true),
+			enabled:      new(true),
 			loadType:     AutoConfigLoadTypeHeavyWrites,
 			wantEnabled:  true,
 			wantLoadType: AutoConfigLoadTypeHeavyWrites,
@@ -51,5 +51,3 @@ func TestCheckNSetDefaultsAutoConfig(t *testing.T) {
 		})
 	}
 }
-
-func ptr(b bool) *bool { return &b }

cmd/example-gen/pkg/defaults/manual.go

@@ -31,7 +31,7 @@ func ManualCluster(cr *apiv1.PerconaServerMySQL) {
 }
 
 func mysqlDefaults(spec *apiv1.MySQLSpec) {
-	podSpecDefaults(&spec.PodSpec, ImageMySQL, resources("2Gi", "1", "4Gi", "2"), configurationMySQL, 600, envList("BOOTSTRAP_READ_TIMEOUT", "600", "ASYNC_SOURCE_RETRY_COUNT", "3", "ASYNC_SOURCE_CONNECT_RETRY", "60"), envFromList("mysql-env-secret"))
+	podSpecDefaults(&spec.PodSpec, ImageMySQL, resources("1Gi", "1", "2Gi", "2"), configurationMySQL, 600, envList("BOOTSTRAP_READ_TIMEOUT", "600", "ASYNC_SOURCE_RETRY_COUNT", "3", "ASYNC_SOURCE_CONNECT_RETRY", "60"), envFromList("mysql-env-secret"))
 
 	spec.AutoRecovery = true
 	spec.VolumeSpec = nil

cmd/example-gen/pkg/defaults/preset.go

@@ -106,7 +106,7 @@ func FromPresets(cr any) error {
 				},
 				Resources: corev1.VolumeResourceRequirements{
 					Requests: corev1.ResourceList{
-						corev1.ResourceStorage: resource.MustParse("2Gi"),
+						corev1.ResourceStorage: resource.MustParse("4Gi"),
 					},
 				},
 			},

deploy/cr.yaml

@@ -207,7 +207,7 @@ spec:
 #          - ReadWriteOnce
         resources:
           requests:
-            storage: 5Gi
+            storage: 4Gi
 #        storageClassName: standard
 #    configuration: |-
 #      max_connections=250
@@ -1002,7 +1002,7 @@ spec:
 #              - ReadWriteOnce
 #            resources:
 #              requests:
-#                storage: 2Gi
+#                storage: 4Gi
 #            storageClassName: standard
 #    encryptionKeySecret:
 #      key: encryptionKey

pkg/controller/ps/mysql_autoconfig_test.go

@@ -1,7 +1,6 @@
 package ps
 
 import (
-	"context"
 	"strings"
 	"testing"
 
@@ -53,7 +52,7 @@ func TestReconcileMySQLAutoConfig(t *testing.T) {
 		t.Helper()
 		cm := new(corev1.ConfigMap)
 		nn := types.NamespacedName{Name: mysql.AutoConfigMapName(cr), Namespace: cr.Namespace}
-		require.NoError(t, r.Client.Get(context.Background(), nn, cm))
+		require.NoError(t, r.Get(t.Context(), nn, cm))
 		return cm.Data[mysql.CustomConfigKey]
 	}
 
@@ -102,7 +101,7 @@ func TestReconcileMySQLAutoConfig(t *testing.T) {
 			cr := newCR(tt.enabled, tt.version)
 			r := newReconciler(t, cr)
 
-			require.NoError(t, r.reconcileMySQLAutoConfig(context.Background(), cr))
+			require.NoError(t, r.reconcileMySQLAutoConfig(t.Context(), cr))
 
 			config := autoConfig(t, r, cr)
 			assert.Contains(t, config, "innodb_buffer_pool_size=", "both paths size the buffer pool")
@@ -111,12 +110,8 @@ func TestReconcileMySQLAutoConfig(t *testing.T) {
 		})
 	}
 
-	// The redo log the calculator sizes from memory is preallocated on the data
-	// volume at startup, and a node joining by clone needs free space for the
-	// donor's estimate on top of its own. The reconcile trims it to fit rather
-	// than leaving a cluster that cannot bootstrap.
 	t.Run("a data volume smaller than the calculated redo log trims it", func(t *testing.T) {
-		ctx := context.Background()
+		ctx := t.Context()
 		cr := newCR(true, "8.4")
 		withDataVolume(cr, "2Gi")
 		r := newReconciler(t, cr)
@@ -126,10 +121,8 @@ func TestReconcileMySQLAutoConfig(t *testing.T) {
 		assert.Contains(t, autoConfig(t, r, cr), "innodb_redo_log_capacity=536870912")
 	})
 
-	// Trimming stops at the smallest redo log MySQL accepts, so a volume below
-	// that leaves nothing to write: the reconcile fails until the user resizes.
 	t.Run("a data volume too small for the minimum redo log fails the reconcile", func(t *testing.T) {
-		ctx := context.Background()
+		ctx := t.Context()
 		cr := newCR(true, "8.4")
 		withDataVolume(cr, "16Mi")
 		r := newReconciler(t, cr)
@@ -143,14 +136,12 @@ func TestReconcileMySQLAutoConfig(t *testing.T) {
 		// No autotune fallback was written in its place.
 		cm := new(corev1.ConfigMap)
 		nn := types.NamespacedName{Name: mysql.AutoConfigMapName(cr), Namespace: cr.Namespace}
-		assert.True(t, k8serrors.IsNotFound(r.Client.Get(ctx, nn, cm)),
+		assert.True(t, k8serrors.IsNotFound(r.Get(ctx, nn, cm)),
 			"no ConfigMap should be written when the calculated configuration does not fit")
 	})
 
-	// The ConfigMap is rebuilt from the spec on every pass, so a wrong version
-	// costs nothing more than the fallback it caused.
 	t.Run("correcting the version restores the calculated configuration", func(t *testing.T) {
-		ctx := context.Background()
+		ctx := t.Context()
 		cr := newCR(true, "5.7")
 		r := newReconciler(t, cr)
 
@@ -163,7 +154,7 @@ func TestReconcileMySQLAutoConfig(t *testing.T) {
 	})
 
 	t.Run("correcting the version leaves no parameter of the wrong one behind", func(t *testing.T) {
-		ctx := context.Background()
+		ctx := t.Context()
 		// Removed in MySQL 8.4, still emitted for 8.0 — and emitted bare, so
 		// mysqld would refuse to boot on it.
 		const removedIn84 = "innodb_log_file_size="

pkg/controller/ps/mysql_config_test.go

@@ -158,9 +158,9 @@ func TestReconcileMySQLConfig(t *testing.T) {
 		state             apiv1.StatefulAppState // status.state
 		mysqlState        apiv1.StatefulAppState // status.mysql.state; defaults to ready
 		currentConfig     string
-		autoConfig        string    // my.cnf in the ConfigMap; empty means no ConfigMap at all
-		lastAppliedConfig string                 // JSON string on the statefulset annotation; empty means absent
-		object            []client.Object        // what the API holds besides the CR, the ConfigMap and the statefulset; nil means a healthy cluster
+		autoConfig        string            // my.cnf in the ConfigMap; empty means no ConfigMap at all
+		lastAppliedConfig string            // JSON string on the statefulset annotation; empty means absent
+		object            []client.Object   // what the API holds besides the CR, the ConfigMap and the statefulset; nil means a healthy cluster
 		stmtErrs          map[string]string // stderr mysql answers a given statement with; drives the case on its own
 
 		expectedStmts  []string // List of SET GLOBAL statements expected on all pods

pkg/mysql/config.go

@@ -459,7 +459,7 @@ func dropAliasedKeys(section *ini.Section) {
 }
 
 func withMySQLdSection(part string) string {
-	for _, line := range strings.Split(part, "\n") {
+	for line := range strings.SplitSeq(part, "\n") {
 		line = strings.TrimSpace(line)
 		if line == "" || strings.HasPrefix(line, "#") || strings.HasPrefix(line, ";") {
 			continue