From c688eef9fbe3b04455ee9c6749bec82584aeea70 Mon Sep 17 00:00:00 2001 From: youjiali1995 Date: Thu, 22 Aug 2019 15:09:35 +0800 Subject: [PATCH] fix pessimistic-txn config of tikv Signed-off-by: youjiali1995 --- conf/tikv.yml | 7 ++----- roles/tikv/templates/tikv.toml.j2 | 5 +++++ roles/tikv/vars/default.yml | 7 ++----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/conf/tikv.yml b/conf/tikv.yml index 2f811b0f3..1934ac0fc 100644 --- a/conf/tikv.yml +++ b/conf/tikv.yml @@ -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 diff --git a/roles/tikv/templates/tikv.toml.j2 b/roles/tikv/templates/tikv.toml.j2 index 0dfc6393b..610b842db 100644 --- a/roles/tikv/templates/tikv.toml.j2 +++ b/roles/tikv/templates/tikv.toml.j2 @@ -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 %} diff --git a/roles/tikv/vars/default.yml b/roles/tikv/vars/default.yml index 299e932bd..171dbfba1 100644 --- a/roles/tikv/vars/default.yml +++ b/roles/tikv/vars/default.yml @@ -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