v2.0.11

pingcap · Jan 3, 2019 · 63e9033 · 63e9033
1 parent 93b3e2c
commit 63e9033
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/conf/tidb.yml b/conf/tidb.yml
@@ -220,6 +220,10 @@ tikv_client:
 
   # max time for commit command, must be twice bigger than raft election timeout.
   # commit-timeout: "41s"
+  # The max time a Txn may use (in seconds) from its startTS to commitTS.
+  # We use it to guarantee GC worker will not influence any active txn. Please make sure that this
+  # value is less than gc_life_time - 10s.
+  # max-txn-time-use: 590
 
 binlog:
   # WriteTimeout specifies how long it will wait for writing binlog to pump.

diff --git a/inventory.ini b/inventory.ini
@@ -60,7 +60,7 @@ ansible_user = tidb
 
 cluster_name = test-cluster
 
-tidb_version = v2.0.10
+tidb_version = v2.0.11
 
 # process supervision, [systemd, supervise]
 process_supervision = systemd

diff --git a/roles/tidb/vars/default.yml b/roles/tidb/vars/default.yml
@@ -230,6 +230,11 @@ tikv_client:
   # max time for commit command, must be twice bigger than raft election timeout.
   commit-timeout: "41s"
 
+  # The max time a Txn may use (in seconds) from its startTS to commitTS.
+  # We use it to guarantee GC worker will not influence any active txn. Please make sure that this
+  # value is less than gc_life_time - 10s.
+  max-txn-time-use: 590
+
 binlog:
   # Socket file to write binlog.
   # binlog-socket: ""