Skip to content
This repository has been archived by the owner on Jun 24, 2021. It is now read-only.

reduce config items #978

Merged
merged 1 commit into from
Sep 29, 2019
Merged

reduce config items #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions conf/pd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,11 @@ global:
# lease: 3
# tso-save-interval: "3s"

# namespace-classifier: "table"

# enable-prevote: true

security:
# Path of file that contains list of trusted SSL CAs. if set, following four settings shouldn't be empty
# cacert-path: ""
# Path of file that contains X509 certificate in PEM format.
# cert-path: ""
# Path of file that contains X509 key in PEM format.
# key-path: ""

log:
#level: "info"

# log format, one of json, text, console
# format: "text"

# disable automatic timestamps in output
# disable-timestamp: false

# file logging
file:
# max log file size in MB
Expand All @@ -38,7 +22,7 @@ log:
# log-rotate: true

metric:

schedule:
# max-merge-region-size: 20
# max-merge-region-keys: 200000
Expand Down
98 changes: 10 additions & 88 deletions conf/tidb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,9 @@ global:
# The socket file to use for connection.
# socket: ""

# Run ddl worker on this tidb-server.
# run-ddl: true

# Schema lease duration, very dangerous to change only if you know what you do.
# lease: "45s"

# When create table, split a separated region for it. It is recommended to
# turn off this option if there will be a large number of tables created.
# split-table: true

# The limit of concurrent executed sessions.
# token-limit: 1000

Expand All @@ -27,12 +20,6 @@ global:
# Set the memory quota for a query in bytes. Default: 32GB
# mem-quota-query: 34359738368

# Enable coprocessor streaming.
# enable-streaming: false

# Set system variable 'lower_case_table_names'
# lower-case-table-names: 2

# Make "kill query" behavior compatible with MySQL. It's not recommend to
# turn on this option when TiDB server is behind a proxy.
# compatible-kill-query: false
Expand All @@ -44,57 +31,25 @@ log:
# Log level: debug, info, warn, error, fatal.
# level: "info"

# Log format, one of json, text, console.
# format: "text"

# Disable automatic timestamps in output
# disable-timestamp: false

# Queries with execution time greater than this value will be logged. (Milliseconds)
# slow-threshold: 300

# Queries with internal result greater than this value will be logged.
# expensive-threshold: 10000

# Maximum query length recorded in log.
Copy link
Contributor

@winkyao winkyao Sep 29, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Could we confirm that all the removed items is mentioned in documents?

Copy link
Member Author

Choose a reason for hiding this comment

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

OK, I'll check it

# query-log-max-len: 2048

# File logging.
file:
# Max log file size in MB. (upper limit to 4096MB).
# max-size: 300

# Max log file keep days. No clean up by default.
# max-days: 0

# Maximum number of old log files to retain. No clean up by default.
# max-backups: 0

# Rotate log by day
# log-rotate: true

security:
# Path of file that contains list of trusted SSL CAs for connection with mysql client.
# ssl-ca: ""

# Path of file that contains X509 certificate in PEM format for connection with mysql client.
# ssl-cert: ""

# Path of file that contains X509 key in PEM format for connection with mysql client.
# ssl-key: ""

# Path of file that contains list of trusted SSL CAs for connection with cluster components.
# cluster-ssl-ca: ""
status:
# TiDB status host.
# status-host = "0.0.0.0"

# Path of file that contains X509 certificate in PEM format for connection with cluster components.
# cluster-ssl-cert: ""
# Prometheus pushgateway address, leaves it empty will disable prometheus push.
# TiDB status port.
# status-port = 10080

# Path of file that contains X509 key in PEM format for connection with cluster components.
# cluster-ssl-key: ""
# Prometheus pushgateway address, leaves it empty will disable prometheus push.
# metrics-addr = ""

status:
# If enable status report HTTP service.
# report-status: true
# Prometheus client push interval in second, set \"0\" to disable prometheus push.
# metrics-interval = 15

performance:
# Max CPUs to use, 0 use number of CPUs in the machine.
Expand All @@ -106,39 +61,10 @@ performance:
# StmtCountLimit limits the max count of statement inside a transaction.
# stmt-count-limit: 5000

# Set keep alive option for tcp connection.
# tcp-keep-alive: true

# Whether support cartesian product.
# cross-join: true

# Stats lease duration, which influences the time of analyze and stats load.
# stats-lease: "3s"

# Run auto analyze worker on this tidb-server.
# run-auto-analyze: true

# Probability to use the query feedback to update stats, 0 or 1 for always false/true.
# feedback-probability: 0.05

# The max number of query feedback that cache in memory.
# query-feedback-limit: 1024

# Pseudo stats will be used if the ratio between the modify count and
# row count in statistics of a table is greater than it.
# pseudo-estimate-ratio: 0.8
Copy link
Member

Choose a reason for hiding this comment

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

It's better to keep them in the config files:

run-auto-analyze
feedback-probability
query-feedback-limit
pseudo-estimate-ratio

Copy link
Member Author

Choose a reason for hiding this comment

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

https://docs.google.com/spreadsheets/d/1fmY3MSklHb9jYQOv3Djcrhj3Uz97fI06soaMy4OKcRs/edit#gid=0

PM think they should not be visible to user


# Force the priority of all statements in a specified priority.
# The value could be "NO_PRIORITY", "LOW_PRIORITY", "HIGH_PRIORITY" or "DELAYED".
# force-priority: "NO_PRIORITY"

proxy_protocol:
# PROXY protocol acceptable client networks.
# Empty string means disable PROXY protocol, * means all networks.
# networks: ""

# PROXY protocol header read timeout, unit is second
# header-timeout: 5

prepared_plan_cache:
# enabled: false
Expand Down Expand Up @@ -224,10 +150,6 @@ tikv_client:
# batch-wait-size: 8

txn_local_latches:
# Enable local latches for transactions. Enable it when
# there are lots of conflicts between transactions.
# enabled: false
# capacity: 2048000

binlog:
# WriteTimeout specifies how long it will wait for writing binlog to pump.
Expand Down
Loading