From cd3d3cd6aeb53ba91d5b5861bcd0100a358c0e38 Mon Sep 17 00:00:00 2001 From: dongxu Date: Tue, 24 Nov 2015 19:18:53 +0800 Subject: [PATCH] kv: address comments --- kv/txn.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kv/txn.go b/kv/txn.go index e2bf6f704e..4e83a5b08a 100644 --- a/kv/txn.go +++ b/kv/txn.go @@ -25,7 +25,9 @@ func IsRetryableError(err error) bool { return false } - if terror.ErrorEqual(err, ErrRetryable) { + if terror.ErrorEqual(err, ErrRetryable) || + terror.ErrorEqual(err, ErrLockConflict) || + terror.ErrorEqual(err, ErrConditionNotMatch) { return true }