Ensure SLOW_LOG_FILE env variable is always set

images/tidb-operator-e2e/tidb-cluster-values.yaml

@@ -148,7 +148,6 @@ tidb:
     exposeStatus: true
     # annotations:
       # cloud.google.com/load-balancer-type: Internal
-  separateSlowLog: true
 
 # mysqlClient is used to set password for TiDB
 # it must has Python MySQL client installed

pkg/manager/member/tidb_member_manager.go

@@ -273,6 +273,10 @@ func (tmm *tidbMemberManager) getNewTiDBSetForTidbCluster(tc *v1alpha1.TidbClust
 		})
 	}
 
+	slowLogFileEnvVal := ""
+	if tc.Spec.TiDB.SeparateSlowLog {
+		slowLogFileEnvVal = slowQueryLogFile
+	}
 	envs := []corev1.EnvVar{
 		{
 			Name:  "CLUSTER_NAME",
@@ -286,13 +290,12 @@ func (tmm *tidbMemberManager) getNewTiDBSetForTidbCluster(tc *v1alpha1.TidbClust
 			Name:  "BINLOG_ENABLED",
 			Value: strconv.FormatBool(tc.Spec.TiDB.BinlogEnabled),
 		},
-	}
-	if tc.Spec.TiDB.SeparateSlowLog {
-		envs = append(envs, corev1.EnvVar{
+		{
 			Name:  "SLOW_LOG_FILE",
-			Value: slowQueryLogFile,
-		})
+			Value: slowLogFileEnvVal,
+		},
 	}
+
 	containers = append(containers, corev1.Container{
 		Name:            v1alpha1.TiDBMemberType.String(),
 		Image:           tc.Spec.TiDB.Image,

tests/e2e/create.go

@@ -56,13 +56,14 @@ type Response struct {
 	}
 }
 
-func testCreate(ns, clusterName string) {
+func testCreate(spec clusterSpec) {
+	ns, clusterName := spec.ns, spec.clusterName
 	By(fmt.Sprintf("When create the TiDB cluster: %s/%s", ns, clusterName))
 	instanceName := getInstanceName(ns, clusterName)
 
 	cmdStr := fmt.Sprintf("helm install /charts/tidb-cluster -f /tidb-cluster-values.yaml"+
-		" -n %s --namespace=%s --set clusterName=%s,tidb.passwordSecretName=%s",
-		instanceName, ns, clusterName, ns+"-"+clusterName)
+		" -n %s --namespace=%s --set %s",
+		instanceName, ns, buildSetFlag(spec))
 	_, err := execCmd(cmdStr)
 	Expect(err).NotTo(HaveOccurred())
 

tests/e2e/e2e_test.go

@@ -58,7 +58,7 @@ var _ = Describe("Smoke", func() {
 		fixture := fixtures[i]
 		It(fmt.Sprintf("Namespace: %s, clusterName: %s", fixture.ns, fixture.clusterName), func() {
 			for _, testCase := range fixture.cases {
-				testCase(fixture.ns, fixture.clusterName)
+				testCase(fixture.clusterSpec)
 			}
 		})
 	}

tests/e2e/scale.go

@@ -37,7 +37,8 @@ const (
 
 var podUIDsBeforeScale map[string]types.UID
 
-func testScale(ns, clusterName string) {
+func testScale(spec clusterSpec) {
+	ns, clusterName := spec.ns, spec.clusterName
 	instanceName := getInstanceName(ns, clusterName)
 	By(fmt.Sprintf("When scale out TiDB cluster: pd ==> [%d], tikv ==> [%d], tidb ==> [%d]", pdScaleOutTo, tikvScaleOutTo, tidbScaleOutTo))
 	err := wait.Poll(5*time.Second, 5*time.Minute, func() (bool, error) {

tests/e2e/test_helper.go

@@ -14,6 +14,7 @@
 package e2e
 
 import (
+	"bytes"
 	"fmt"
 	"os/exec"
 	"sort"
@@ -42,36 +43,56 @@ var (
 	kubeCli kubernetes.Interface
 )
 
-type clusterFixture struct {
+type clusterSpec struct {
 	ns          string
 	clusterName string
-	cases       []testCase
+
+	// values override the specified helm values
+	values map[string]string
+}
+
+type clusterFixture struct {
+	clusterSpec
+
+	cases []testCase
 }
 
-type testCase func(ns, name string)
+type testCase func(cluster clusterSpec)
 
 var fixtures = []clusterFixture{
 	{
-		ns:          "ns-1",
-		clusterName: "cluster-name-1",
+		clusterSpec: clusterSpec{
+			ns:          "ns-1",
+			clusterName: "cluster-name-1",
+		},
 		cases: []testCase{
 			testCreate,
 			testScale,
 			testUpgrade,
 		},
 	},
 	{
-		ns:          "ns-1",
-		clusterName: "cluster-name-2",
+		clusterSpec: clusterSpec{
+			ns:          "ns-1",
+			clusterName: "cluster-name-2",
+			values: map[string]string{
+				"tidb.separateSlowLog": "true",
+			},
+		},
 		cases: []testCase{
 			testCreate,
 			testUpgrade,
 			testScale,
 		},
 	},
 	{
-		ns:          "ns-2",
-		clusterName: "cluster-name-1",
+		clusterSpec: clusterSpec{
+			ns:          "ns-2",
+			clusterName: "cluster-name-1",
+			values: map[string]string{
+				"tidb.separateSlowLog": "false",
+			},
+		},
 		cases: []testCase{
 			testCreate,
 			testScale,
@@ -89,6 +110,15 @@ var fixtures = []clusterFixture{
 	// },
 }
 
+func buildSetFlag(spec clusterSpec) string {
+	var buffer bytes.Buffer
+	buffer.WriteString(fmt.Sprintf("clusterName=%s,tidb.passwordSecretName=%s", spec.clusterName, spec.ns+"-"+spec.clusterName))
+	for k, v := range spec.values {
+		buffer.WriteString(fmt.Sprintf(",%s=%s", k, v))
+	}
+	return buffer.String()
+}
+
 func clearOperator() error {
 	for _, fixture := range fixtures {
 		_, err := execCmd(fmt.Sprintf("helm del --purge %s", fmt.Sprintf("%s-%s", fixture.ns, fixture.clusterName)))

tests/e2e/upgrade.go

@@ -33,7 +33,8 @@ const (
 	upgradeVersion = "v2.1.0"
 )
 
-func testUpgrade(ns, clusterName string) {
+func testUpgrade(spec clusterSpec) {
+	ns, clusterName := spec.ns, spec.clusterName
 	pdNodeMap, err := getNodeMap(ns, clusterName, label.PDLabelVal)
 	Expect(err).NotTo(HaveOccurred())
 	tikvNodeMap, err := getNodeMap(ns, clusterName, label.TiKVLabelVal)