Merge branch 'master' into kennytm/lightning-2019-12

v3.0/reference/tools/tidb-lightning/deployment.md

@@ -263,55 +263,6 @@ Refer to the [TiDB enterprise tools download page](/v3.0/reference/tools/downloa
     password = ""
     # Table schema information is fetched from TiDB via this status-port.
     status-port = 10080
-    # Address of any PD server from the cluster
-    pd-addr = "172.16.31.4:2379"
-    # tidb-lightning imports TiDB as a library and generates some logs itself.
-    # This setting controls the log level of the TiDB library.
-    log-level = "error"
-    # MySQL SQL Mode configuration
-    # sql-mode = ""
-    # Sets maximum packet size allowed for SQL connections.
-    # Set this to 0 to automatically fetch the `max_allowed_packet` variable from server on every connection.
-    # max-allowed-packet = 67_108_864
-
-    # Sets the TiDB session variable to speed up the Checksum and Analyze operations.
-    # See https://pingcap.com/docs/dev/reference/performance/statistics/#control-analyze-concurrency
-    # for the meaning of each setting
-    build-stats-concurrency = 20
-    distsql-scan-concurrency = 100
-    index-serial-scan-concurrency = 20
-    checksum-table-concurrency = 16
-
-    # When data importing is complete, tidb-lightning can automatically perform
-    # the Checksum, Compact and Analyze operations. It is recommended to leave
-    # these as true in the production environment.
-    # The execution order: Checksum -> Analyze
-    [post-restore]
-    # Performs `ADMIN CHECKSUM TABLE <table>` for each table to verify data integrity.
-    checksum = true
-    # If the value is set to `true`, a level-1 compaction is performed
-    # every time a table is imported.
-    # The default value is `false`.
-    level-1-compact = false
-    # If the value is set to `true`, a full compaction on the whole
-    # TiKV cluster is performed at the end of the import.
-    # The default value is `false`.
-    compact = false
-    # Performs `ANALYZE TABLE <table>` for each table.
-    analyze = true
-
-    # Configures the background periodic actions
-    # Supported units: h (hour), m (minute), s (second).
-    [cron]
-    # Duration between which Lightning automatically refreshes the import mode
-    # status. Should be shorter than the corresponding TiKV setting.
-    switch-mode = "5m"
-    # Duration between which an import progress is printed to the log.
-    log-progress = "5m"
-
-    # Table filter options. See the corresponding section for details.
-    # [black-white-list]
-    # ...
     ```
 
     The above only shows the essential settings.

v3.1/reference/tools/tidb-lightning/deployment.md

@@ -263,55 +263,6 @@ Refer to the [TiDB enterprise tools download page](/v3.1/reference/tools/downloa
     password = ""
     # Table schema information is fetched from TiDB via this status-port.
     status-port = 10080
-    # Address of any PD server from the cluster
-    pd-addr = "172.16.31.4:2379"
-    # tidb-lightning imports TiDB as a library and generates some logs itself.
-    # This setting controls the log level of the TiDB library.
-    log-level = "error"
-    # MySQL SQL Mode configuration
-    # sql-mode = ""
-    # Sets maximum packet size allowed for SQL connections.
-    # Set this to 0 to automatically fetch the `max_allowed_packet` variable from server on every connection.
-    # max-allowed-packet = 67_108_864
-
-    # Sets the TiDB session variable to speed up the Checksum and Analyze operations.
-    # See https://pingcap.com/docs/dev/reference/performance/statistics/#control-analyze-concurrency
-    # for the meaning of each setting
-    build-stats-concurrency = 20
-    distsql-scan-concurrency = 100
-    index-serial-scan-concurrency = 20
-    checksum-table-concurrency = 16
-
-    # When data importing is complete, tidb-lightning can automatically perform
-    # the Checksum, Compact and Analyze operations. It is recommended to leave
-    # these as true in the production environment.
-    # The execution order: Checksum -> Analyze
-    [post-restore]
-    # Performs `ADMIN CHECKSUM TABLE <table>` for each table to verify data integrity.
-    checksum = true
-    # If the value is set to `true`, a level-1 compaction is performed
-    # every time a table is imported.
-    # The default value is `false`.
-    level-1-compact = false
-    # If the value is set to `true`, a full compaction on the whole
-    # TiKV cluster is performed at the end of the import.
-    # The default value is `false`.
-    compact = false
-    # Performs `ANALYZE TABLE <table>` for each table.
-    analyze = true
-
-    # Configures the background periodic actions
-    # Supported units: h (hour), m (minute), s (second).
-    [cron]
-    # Duration between which Lightning automatically refreshes the import mode
-    # status. Should be shorter than the corresponding TiKV setting.
-    switch-mode = "5m"
-    # Duration between which an import progress is printed to the log.
-    log-progress = "5m"
-
-    # Table filter options. See the corresponding section for details.
-    # [black-white-list]
-    # ...
     ```
 
     The above only shows the essential settings.