From abcb589658114734ac386059a5d4c4e13cbc02f2 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Tue, 14 Jul 2020 18:54:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(asset=5Fuser):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BAAuthBook=E5=AF=B9=E8=B1=A1=E9=94=81=E6=9C=BA?=
 =?UTF-8?q?=E5=88=B6=EF=BC=8C=E4=BD=BF=E7=94=A8select=5Ffor=5Fupdate?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2redis=5Flock?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/models/authbook.py | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/apps/assets/models/authbook.py b/apps/assets/models/authbook.py
index b5882eb45..895268b2a 100644
--- a/apps/assets/models/authbook.py
+++ b/apps/assets/models/authbook.py
@@ -59,24 +59,17 @@ class AuthBook(BaseUser):
         """
         username = kwargs['username']
         asset = kwargs['asset']
-        lock_key = 'KEY_LOCK_CREATE_AUTH_BOOK_{}_{}'.format(username, asset.id)
-        lock = cache.lock(lock_key, expire=60)
-
-        acquired = lock.acquire(timeout=60)
-        if acquired:
-            # 将获取锁的超时时间和锁本身过期时间设置为一致，保证并发创建时不会丢失，最长等待60s后执行
-            with transaction.atomic():
-                cls.objects.filter(
-                    username=username, asset=asset, is_latest=True
-                ).update(is_latest=False)
-                max_version = cls.get_max_version(username, asset)
-                kwargs.update({
-                    'version': max_version + 1,
-                    'is_latest': True
-                })
-                obj = cls.objects.create(**kwargs)
-            if lock.locked():
-                lock.release()
+        with transaction.atomic():
+            # 使用select_for_update限制并发创建相同的username、asset数据
+            cls.objects.select_for_update().filter(
+                username=username, asset=asset, is_latest=True
+            ).update(is_latest=False)
+            max_version = cls.get_max_version(username, asset)
+            kwargs.update({
+                'version': max_version + 1,
+                'is_latest': True
+            })
+            obj = cls.objects.create(**kwargs)
             return obj
 
     @property