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 (#11645) #11704

Merged
merged 2 commits into from
Dec 23, 2022
Merged

Delete 3 tidb configs that have been deleted in code (#11645) #11704

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
be3ea2d
This is an automated cherry-pick of #11645
TomShawn Dec 23, 2022
c485289
Update upgrade-tidb-using-tiup.md
TomShawn Dec 23, 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 @@ -80,7 +80,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 @@ -80,7 +80,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 @@ -117,13 +117,17 @@ Now, the offline mirror has been upgraded successfully. If an error occurs durin

> **Note:**
>
<<<<<<< HEAD
> Before you upgrade the cluster to v5.3, make sure that the parameters you have modified in v4.0 are compatible in v5.3. For details, see [TiKV Configuration File](/tikv-configuration-file.md).
>
> The following three TiKV parameters are obsolete in TiDB v5.3. If the following parameters have been configured in your original cluster, you need to delete these parameters through `edit-config`:
>
> - pessimistic-txn.enabled
> - server.request-batch-enable-cross-command
> - server.request-batch-wait-duration
=======
> Before you upgrade the cluster to v6.4.0, make sure that the parameters you have modified in v4.0 are compatible in v6.4.0. For details, see [TiKV Configuration File](/tikv-configuration-file.md).
>>>>>>> 288076c20 (Delete 3 tidb configs that have been deleted in code (#11645))
TomShawn marked this conversation as resolved.
Show resolved Hide resolved

### Step 3: Check the health status of the current cluster

Expand Down