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

Commit

Permalink
fix pessimistic-txn config of tikv (#910) (#911)
Browse files Browse the repository at this point in the history
Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>
  • Loading branch information
youjiali1995 authored and liubo0127 committed Aug 22, 2019
1 parent 4ef6d60 commit fce1761
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
7 changes: 2 additions & 5 deletions conf/tikv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -711,17 +711,14 @@ import:
## Stream channel window size, stream will be blocked on channel full.
# stream-channel-window: 128

pessimistic-txn:
pessimistic_txn:
## Enable pessimistic transaction
# enabled: true

## Time to wait in milliseconds before responding to TiDB when pessimistic
## transactions # encounter locks
## transactions encounter locks
# wait-for-lock-timeout: 3000

## Time to delay in milliseconds before responding to TiDB when other transactions
## release locks that pessimistic transactions are waiting for(0 to disable).
# wake-up-delay-duration: 1

## Interval in milliseconds to check the membership change of deadlock detector.
# monitor-membership-interval: 3000
5 changes: 5 additions & 0 deletions roles/tikv/templates/tikv.toml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,8 @@
{% for item, value in tikv_conf.import | dictsort -%}
{{ item }} = {{ value | to_json }}
{% endfor %}

[pessimistic-txn]
{% for item, value in tikv_conf.pessimistic_txn | dictsort -%}
{{ item }} = {{ value | to_json }}
{% endfor %}
7 changes: 2 additions & 5 deletions roles/tikv/vars/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -711,17 +711,14 @@ import:
## Stream channel window size, stream will be blocked on channel full.
# stream-channel-window: 128

pessimistic-txn:
pessimistic_txn:
## Enable pessimistic transaction
# enabled: true

## Time to wait in milliseconds before responding to TiDB when pessimistic
## transactions # encounter locks
## transactions encounter locks
# wait-for-lock-timeout: 3000

## Time to delay in milliseconds before responding to TiDB when other transactions
## release locks that pessimistic transactions are waiting for(0 to disable).
# wake-up-delay-duration: 1

## Interval in milliseconds to check the membership change of deadlock detector.
# monitor-membership-interval: 3000

0 comments on commit fce1761

Please sign in to comment.