binglog: fix tls error when create pump with TLS when use CRD (#1799) #1838

sre-bot · 2020-03-02T07:30:57Z

cherry-pick #1799 to release-1.1

What problem does this PR solve?

If use CRD to create pump with tls , pump will create failed

What is changed and how does it work?

fix tiny config

Check List

Tests

Manual test (add detailed scripts or steps below)
use this tc yaml to test and use latest binlog tag as 3.0.8

  apiVersion: pingcap.com/v1alpha1
  kind: TidbCluster
  metadata:
    name: db
    namespace: tidb8
  spec:
    configUpdateStrategy: RollingUpdate
    enableTLSCluster: true
    helper:
      image: busybox:1.31.1
    hostNetwork: true
    imagePullPolicy: IfNotPresent
    pd:
      affinity: {}
      baseImage: pingcap/pd
      config:
        log:
          level: info
        replication:
          max-replicas: 3
      podSecurityContext: {}
      replicas: 1
      requests:
        cpu: "1"
        memory: 400Mi
        storage: 1Gi
      storageClassName: local-storage
    pump:
      baseImage: pingcap/tidb-binlog
      replicas: 1
      storageClassName: local-storage
      requests:
        cpu: "1"
        memory: 400Mi
        storage: 45Gi
    tidb:
      affinity: {}
      baseImage: pingcap/tidb
      binlogEnabled: true
      config:
        log:
          level: info
        performance:
          max-procs: 0
      enableTLSClient: true
      maxFailoverCount: 3
      podSecurityContext: {}
      replicas: 1
      requests:
        cpu: "1"
        memory: 400Mi
      separateSlowLog: true
      service:
        annotations:
          pingcap.com/last-applied-configuration: '{"ports":[{"name":"mysql-client","protocol":"TCP","port":4000,"targetPort":4000},{"name":"status","protocol":"TCP","port":10080,"targetPort":10080}],"selector":{"app.kubernetes.io/component":"tidb","app.kubernetes.io/instance":"db","app.kubernetes.io/managed-by":"tidb-operator","app.kubernetes.io/name":"tidb-cluster"},"type":"LoadBalancer","externalTrafficPolicy":"Local"}'
          service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled: "true"
          service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0
          service.beta.kubernetes.io/aws-load-balancer-type: nlb
        exposeStatus: true
        externalTrafficPolicy: Local
        type: LoadBalancer
      slowLogTailer:
        limits:
          cpu: 100m
          memory: 50Mi
        requests:
          cpu: 20m
          memory: 5Mi
    tikv:
      affinity: {}
      baseImage: pingcap/tikv
      config:
        log-level: info
      hostNetwork: false
      maxFailoverCount: 3
      podSecurityContext: {}
      privileged: false
      replicas: 1
      requests:
        cpu: "1"
        memory: 1Gi
        storage: 45Gi
      storageClassName: local-storage
    timezone: UTC
    version: v3.0.8

after apply, log shows pump and tidb works well

[2020/02/27 03:11:53.257 +00:00] [INFO] [version.go:50] ["Welcome to Pump"] ["Release Version"=v4.0.0-beta-8-g0bd1881a] ["Git Commit Hash"=0bd1881a6f1cf91ce3a7a82fcbfa037556976e2a] ["Build TS"="2020-02-21 06:27:36"] ["Go Version"=go1.13] ["Go OS/Arch"=linux/amd64]
[2020/02/27 03:11:53.258 +00:00] [INFO] [main.go:48] ["start pump..."] [config="{\"log-level\":\"info\",\"node-id\":\"\",\"addr\":\"http://10.244.3.1:8250\",\"advertise-addr\":\"http://db-pump-0.db-pump:8250\",\"socket\":\"\",\"pd-urls\":\"https://db-pd:2379\",\"EtcdDialTimeout\":5000000000,\"data-dir\":\"/data\",\"heartbeat-interval\":2,\"gc\":7,\"log-file\":\"\",\"security\":{\"ssl-ca\":\"/var/run/secrets/kubernetes.io/serviceaccount/ca.crt\",\"ssl-cert\":\"/var/lib/pump-tls/cert\",\"ssl-key\":\"/var/lib/pump-tls/key\"},\"gen-binlog-interval\":3,\"MetricsAddr\":\"\",\"MetricsInterval\":15,\"storage\":{\"sync-log\":null,\"kv_chan_cap\":0,\"slow_write_threshold\":0,\"kv\":null,\"stop-write-at-available-space\":null}}"]
[2020/02/27 03:11:53.259 +00:00] [INFO] [client.go:147] ["[pd] create pd client with endpoints"] [pd-address="[https://db-pd:2379]"]
[2020/02/27 03:11:53.314 +00:00] [INFO] [client.go:255] ["[pd] switch leader"] [new-leader=https://db-pd-0.db-pd-peer.tidb8.svc:2379] [old-leader=]
[2020/02/27 03:11:53.318 +00:00] [INFO] [client.go:166] ["[pd] init cluster id"] [cluster-id=6797946772916288597]
[2020/02/27 03:11:53.318 +00:00] [INFO] [server.go:126] ["get clusterID success"] [clusterID=6797946772916288597]
[2020/02/27 03:11:53.318 +00:00] [INFO] [client.go:147] ["[pd] create pd client with endpoints"] [pd-address="[https://db-pd:2379]"]
[2020/02/27 03:11:53.352 +00:00] [INFO] [client.go:255] ["[pd] switch leader"] [new-leader=https://db-pd-0.db-pd-peer.tidb8.svc:2379] [old-leader=]
[2020/02/27 03:11:53.354 +00:00] [INFO] [client.go:166] ["[pd] init cluster id"] [cluster-id=6797946772916288597]
[2020/02/27 03:11:53.399 +00:00] [WARN] [pd.go:109] ["get timestamp too slow"] ["cost time"=39.56503ms]
[2020/02/27 03:11:53.399 +00:00] [INFO] [store.go:68] ["new store"] [path="tikv://db-pd:2379?disableGC=true"]
[2020/02/27 03:11:53.399 +00:00] [INFO] [client.go:147] ["[pd] create pd client with endpoints"] [pd-address="[db-pd:2379]"]
[2020/02/27 03:11:53.429 +00:00] [INFO] [client.go:255] ["[pd] switch leader"] [new-leader=https://db-pd-0.db-pd-peer.tidb8.svc:2379] [old-leader=]
[2020/02/27 03:11:53.430 +00:00] [INFO] [client.go:166] ["[pd] init cluster id"] [cluster-id=6797946772916288597]
[2020/02/27 03:11:53.470 +00:00] [WARN] [pd.go:109] ["get timestamp too slow"] ["cost time"=37.799699ms]
[2020/02/27 03:11:53.470 +00:00] [INFO] [store.go:74] ["new store with retry success"]
[2020/02/27 03:11:53.470 +00:00] [INFO] [storage.go:135] [NewAppendWithResolver] [options="{\"ValueLogFileSize\":524288000,\"Sync\":true,\"KVChanCapacity\":1048576,\"SlowWriteThreshold\":1,\"StopWriteAtAvailableSpace\":10737418240,\"KVConfig\":null}"]

Code changes

Has Go code change

cofyc · 2020-03-02T07:31:18Z

/merge

sre-bot · 2020-03-02T07:31:22Z

Your auto merge job has been accepted, waiting for 1831, 1827

sre-bot · 2020-03-02T07:51:08Z

/run-all-tests

sre-bot · 2020-03-02T09:51:38Z

@sre-bot merge failed.

cofyc · 2020-03-02T11:13:30Z

/merge

sre-bot · 2020-03-02T11:15:41Z

/run-all-tests

sre-bot · 2020-03-02T12:24:09Z

@sre-bot merge failed.

cofyc · 2020-03-02T12:31:27Z

/merge

sre-bot · 2020-03-02T12:31:31Z

Your auto merge job has been accepted, waiting for 1842

sre-bot · 2020-03-02T13:20:10Z

/run-all-tests

sre-bot · 2020-03-02T14:31:39Z

@sre-bot merge failed.

cofyc · 2020-03-03T01:32:32Z

/merge

sre-bot · 2020-03-03T01:32:38Z

/run-all-tests

sre-bot · 2020-03-03T02:25:10Z

@sre-bot merge failed.

cofyc · 2020-03-03T06:42:34Z

/merge

sre-bot · 2020-03-03T06:45:11Z

/run-all-tests

sre-bot · 2020-03-03T07:43:09Z

@sre-bot merge failed.

cofyc · 2020-03-03T09:11:08Z

/merge

sre-bot · 2020-03-03T09:11:38Z

/run-all-tests

aylei

LGTM

sre-bot · 2020-03-03T10:30:39Z

@sre-bot merge failed.

cofyc · 2020-03-03T11:51:56Z

/merge

sre-bot · 2020-03-03T11:52:07Z

/run-all-tests

shuijing198799 added 8 commits March 2, 2020 15:30

pump: add tls to create pump

0db2ed7

address comment

144905a

Script and certcontrol use the same secretname

3307259

address comment

d3dbd7c

address comment

7f138ae

address comment

ed86462

address comment

4a60a48

binlog: fix tls error when create pump use CRD

e7a7ece

sre-bot mentioned this pull request Mar 2, 2020

binglog: fix tls error when create pump with TLS when use CRD #1799

Merged

sre-bot added the type/1.1 cherry-pick label Mar 2, 2020

sre-bot requested review from aylei and DanielZhangQD March 2, 2020 07:31

cofyc approved these changes Mar 2, 2020

View reviewed changes

sre-bot added the CanMerge label Mar 2, 2020

Merge branch 'release-1.1' into release-1.1-88d3dd8c152b

310a27e

Merge branch 'release-1.1' into release-1.1-88d3dd8c152b

4794590

Merge branch 'release-1.1' into release-1.1-88d3dd8c152b

22d3bd5

aylei approved these changes Mar 3, 2020

View reviewed changes

sre-bot merged commit a358038 into pingcap:release-1.1 Mar 3, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

binglog: fix tls error when create pump with TLS when use CRD (#1799) #1838

binglog: fix tls error when create pump with TLS when use CRD (#1799) #1838

sre-bot commented Mar 2, 2020

cofyc commented Mar 2, 2020

sre-bot commented Mar 2, 2020

sre-bot commented Mar 2, 2020

sre-bot commented Mar 2, 2020

cofyc commented Mar 2, 2020

sre-bot commented Mar 2, 2020

sre-bot commented Mar 2, 2020

cofyc commented Mar 2, 2020

sre-bot commented Mar 2, 2020

sre-bot commented Mar 2, 2020

sre-bot commented Mar 2, 2020

cofyc commented Mar 3, 2020

sre-bot commented Mar 3, 2020

sre-bot commented Mar 3, 2020

cofyc commented Mar 3, 2020

sre-bot commented Mar 3, 2020

sre-bot commented Mar 3, 2020

cofyc commented Mar 3, 2020

sre-bot commented Mar 3, 2020

aylei left a comment

sre-bot commented Mar 3, 2020

cofyc commented Mar 3, 2020

sre-bot commented Mar 3, 2020

binglog: fix tls error when create pump with TLS when use CRD (#1799) #1838

binglog: fix tls error when create pump with TLS when use CRD (#1799) #1838

Conversation

sre-bot commented Mar 2, 2020

What problem does this PR solve?

What is changed and how does it work?

Check List

cofyc commented Mar 2, 2020

sre-bot commented Mar 2, 2020

sre-bot commented Mar 2, 2020

sre-bot commented Mar 2, 2020

cofyc commented Mar 2, 2020

sre-bot commented Mar 2, 2020

sre-bot commented Mar 2, 2020

cofyc commented Mar 2, 2020

sre-bot commented Mar 2, 2020

sre-bot commented Mar 2, 2020

sre-bot commented Mar 2, 2020

cofyc commented Mar 3, 2020

sre-bot commented Mar 3, 2020

sre-bot commented Mar 3, 2020

cofyc commented Mar 3, 2020

sre-bot commented Mar 3, 2020

sre-bot commented Mar 3, 2020

cofyc commented Mar 3, 2020

sre-bot commented Mar 3, 2020

aylei left a comment

Choose a reason for hiding this comment

sre-bot commented Mar 3, 2020

cofyc commented Mar 3, 2020

sre-bot commented Mar 3, 2020