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.

Sign up for GitHub

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

Delete 3 tidb configs that have been deleted in code (#12401) #12420

Merged
merged 2 commits into from
Dec 27, 2022
Merged

Delete 3 tidb configs that have been deleted in code (#12401) #12420

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad85f33
This is an automated cherry-pick of #12401
TomShawn Dec 27, 2022
6cb8047
Update upgrade-tidb-using-tiup.md
TomShawn Dec 27, 2022
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
1 change: 0 additions & 1 deletion benchmark/benchmark-sysbench-v4-vs-v3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ raftstore.apply-pool-size: 3
rocksdb.max-background-jobs: 3
raftdb.max-background-jobs: 3
raftdb.allow-concurrent-memtable-write: true
server.request-batch-enable-cross-command: false
server.grpc-concurrency: 6
readpool.unified.min-thread-count: 5
readpool.unified.max-thread-count: 20
Expand Down
1 change: 0 additions & 1 deletion benchmark/benchmark-sysbench-v5-vs-v4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ raftstore.apply-pool-size: 3
rocksdb.max-background-jobs: 3
raftdb.max-background-jobs: 3
raftdb.allow-concurrent-memtable-write: true
server.request-batch-enable-cross-command: false
server.grpc-concurrency: 6
readpool.unified.min-thread-count: 5
readpool.unified.max-thread-count: 20
Expand Down
1 change: 0 additions & 1 deletion benchmark/v4.0-performance-benchmarking-with-tpcc.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ raftstore.apply-pool-size: 3
rocksdb.max-background-jobs: 3
raftdb.max-background-jobs: 3
raftdb.allow-concurrent-memtable-write: true
server.request-batch-enable-cross-command: false
server.grpc-concurrency: 6
readpool.unified.min-thread-count: 5
readpool.unified.max-thread-count: 20
Expand Down
1 change: 0 additions & 1 deletion benchmark/v5.0-performance-benchmarking-with-tpcc.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ readpool.unified.max-thread-count: 20
readpool.unified.min-thread-count: 5
rocksdb.max-background-jobs: 8
server.grpc-concurrency: 6
server.request-batch-enable-cross-command: false
storage.scheduler-worker-pool-size: 20
```

Expand Down
4 changes: 4 additions & 0 deletions upgrade-tidb-using-tiup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,17 @@ tiup update cluster

> **注意：**
>
<<<<<<< HEAD
> 升级到 5.1 版本前，请确认已在 4.0 修改的参数在 5.1 版本中是兼容的，可参考 [TiKV 配置文件描述](/tikv-configuration-file.md)。
>
> 以下 TiKV 参数在 TiDB v5.1 已废弃。如果在原集群配置过以下参数，需要通过 `edit-config` 编辑模式删除这些参数:
>
> - pessimistic-txn.enabled
> - server.request-batch-enable-cross-command
> - server.request-batch-wait-duration
=======
> 升级到 6.4.0 版本前，请确认已在 4.0 修改的参数在 6.4.0 版本中是兼容的，可参考 [TiKV 配置文件描述](/tikv-configuration-file.md)。
>>>>>>> 01ad42581 (Delete 3 tidb configs that have been deleted in code (#12401))
TomShawn marked this conversation as resolved.
Show resolved Hide resolved

### 2.3 检查当前集群的健康状况

Expand Down