Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix typo and other issues #2242

Merged
merged 11 commits into from
Apr 23, 2020
Merged

fix typo and other issues #2242

merged 11 commits into from
Apr 23, 2020

Conversation

DanielZhangQD
Copy link
Contributor

What problem does this PR solve?

Fix a typo in tiflash config and fixes #2218, #2219

What is changed and how does it work?

Check List

Tests

  • Manual test (add detailed scripts or steps below)
    • Deploy TidbCluster with below CR and enable-placement-rules will be enabled automatically for PD, all the components can be started successfully.
apiVersion: pingcap.com/v1alpha1
kind: TidbCluster
metadata:
  name: test30
  namespace: test30
spec:
  configUpdateStrategy: RollingUpdate
  enablePVReclaim: false
  imagePullPolicy: IfNotPresent
  pd:
    affinity: {}
    baseImage: pingcap/pd
    config:
      log:
        level: info
      replication:
        location-labels:
        - region
        - zone
        - rack
        - host
        max-replicas: 3
    image: pingcap/pd:nightly
    imagePullPolicy: IfNotPresent
    maxFailoverCount: 3
    replicas: 1
    requests:
      storage: 1Gi
    storageClassName: local-storage
  pvReclaimPolicy: Delete
  schedulerName: tidb-scheduler
  services:
  - name: pd
    type: ClusterIP
  tidb:
    affinity: {}
    baseImage: pingcap/tidb
    config:
      log:
        file:
          max-backups: 3
        level: info
    image: pingcap/tidb:nightly
    imagePullPolicy: IfNotPresent
    maxFailoverCount: 3
    replicas: 1
    separateSlowLog: true
    slowLogTailer:
      image: busybox:1.26.2
      imagePullPolicy: IfNotPresent
      limits:
        cpu: 100m
        memory: 50Mi
      requests:
        cpu: 20m
        memory: 5Mi
  tiflash:
    baseImage: pingcap/tiflash
    config:
      config:
        logger:
          errorlog: /data0/logs/error.log
          count: 5
    replicas: 1
    storageClaims:
    - resources:
        requests:
          storage: 10Gi
      storageClassName: local-storage
  tikv:
    affinity: {}
    baseImage: pingcap/tikv
    config:
      log-level: info
    image: pingcap/tikv:nightly
    imagePullPolicy: IfNotPresent
    maxFailoverCount: 3
    replicas: 1
    requests:
      storage: 10Gi
    storageClassName: local-storage
  tlsCluster: {}
  version: v3.1.0-rc

Code changes

  • Has Go code change

Related changes

  • Need to cherry-pick to the release branch

Does this PR introduce a user-facing change?:

NONE

@DanielZhangQD
Copy link
Contributor Author

/run-e2e-tests

Copy link
Contributor

@weekface weekface left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@pingcap pingcap deleted a comment from sre-bot Apr 22, 2020
@pingcap pingcap deleted a comment from sre-bot Apr 22, 2020
@DanielZhangQD
Copy link
Contributor Author

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Apr 23, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Apr 23, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Apr 23, 2020

@DanielZhangQD merge failed.

@DanielZhangQD
Copy link
Contributor Author

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Apr 23, 2020

/run-all-tests

@pingcap pingcap deleted a comment from sre-bot Apr 23, 2020
@pingcap pingcap deleted a comment from sre-bot Apr 23, 2020
@pingcap pingcap deleted a comment from sre-bot Apr 23, 2020
@pingcap pingcap deleted a comment from sre-bot Apr 23, 2020
@pingcap pingcap deleted a comment from sre-bot Apr 23, 2020
@pingcap pingcap deleted a comment from sre-bot Apr 23, 2020
@pingcap pingcap deleted a comment from sre-bot Apr 23, 2020
@pingcap pingcap deleted a comment from sre-bot Apr 23, 2020
@pingcap pingcap deleted a comment from sre-bot Apr 23, 2020
@pingcap pingcap deleted a comment from sre-bot Apr 23, 2020
@pingcap pingcap deleted a comment from sre-bot Apr 23, 2020
@pingcap pingcap deleted a comment from sre-bot Apr 23, 2020
@pingcap pingcap deleted a comment from sre-bot Apr 23, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Apr 23, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Apr 23, 2020

@DanielZhangQD merge failed.

@DanielZhangQD
Copy link
Contributor Author

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Apr 23, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Apr 23, 2020

@DanielZhangQD merge failed.

@DanielZhangQD
Copy link
Contributor Author

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Apr 23, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Apr 23, 2020

@DanielZhangQD merge failed.

@DanielZhangQD
Copy link
Contributor Author

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Apr 23, 2020

/run-all-tests

@sre-bot sre-bot merged commit 2ce86ef into pingcap:master Apr 23, 2020
@DanielZhangQD DanielZhangQD deleted the fix0 branch April 23, 2020 12:19
@sre-bot
Copy link
Contributor

sre-bot commented Apr 23, 2020

cherry pick to release-1.1 in PR #2280

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot start tiflash if TimeZone is not set
5 participants