revert config 3.0 (#1053)

* Revert "update release-3.0 config (#998)"

This reverts commit c156cb3.

* Revert "reduce config items (#978)"

This reverts commit 1043c3d.

conf/pd.yml

@@ -5,11 +5,27 @@ 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
@@ -22,7 +38,7 @@ log:
     # log-rotate: true
 
 metric:
-    
+
 schedule:
   # max-merge-region-size: 20
   # max-merge-region-keys: 200000

conf/tidb.yml

@@ -7,9 +7,16 @@ 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
 
@@ -20,6 +27,12 @@ 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
@@ -31,25 +44,57 @@ 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
 
-status:
-  # TiDB status host.
-  # status-host = "0.0.0.0"
+  # Maximum query length recorded in log.
+  # 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: ""
 
-  # 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 mysql client.
+  # ssl-key: ""
 
-  # Prometheus pushgateway address, leaves it empty will disable prometheus push.
-  # metrics-addr = ""
+  # Path of file that contains list of trusted SSL CAs for connection with cluster components.
+  # cluster-ssl-ca: ""
 
-  # Prometheus client push interval in second, set \"0\" to disable prometheus push.
-  # metrics-interval = 15
+  # Path of file that contains X509 certificate in PEM format for connection with cluster components.
+  # cluster-ssl-cert: ""
+
+  # Path of file that contains X509 key in PEM format for connection with cluster components.
+  # cluster-ssl-key: ""
+
+status:
+  # If enable status report HTTP service.
+  # report-status: true
 
 performance:
   # Max CPUs to use, 0 use number of CPUs in the machine.
@@ -61,10 +106,39 @@ 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
+
+  # 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
@@ -150,6 +224,10 @@ 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.