fix(asset_user): 修改创建AuthBook对象锁机制,使用select_for_update替换redis_lock

pull/4318/head
Bai 2020-07-14 18:54:55 +08:00 committed by 老广
parent 1bb366ad94
commit abcb589658
1 changed files with 11 additions and 18 deletions

View File

@ -59,14 +59,9 @@ class AuthBook(BaseUser):
""" """
username = kwargs['username'] username = kwargs['username']
asset = kwargs['asset'] 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(): with transaction.atomic():
cls.objects.filter( # 使用select_for_update限制并发创建相同的username、asset数据
cls.objects.select_for_update().filter(
username=username, asset=asset, is_latest=True username=username, asset=asset, is_latest=True
).update(is_latest=False) ).update(is_latest=False)
max_version = cls.get_max_version(username, asset) max_version = cls.get_max_version(username, asset)
@ -75,8 +70,6 @@ class AuthBook(BaseUser):
'is_latest': True 'is_latest': True
}) })
obj = cls.objects.create(**kwargs) obj = cls.objects.create(**kwargs)
if lock.locked():
lock.release()
return obj return obj
@property @property