Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove transaction management hacks in get_client. 

I'm pretty sure this code was a hack to workaround the fact that
without database-level autocommit, .get_or_create is racy.

(imported from commit bfdd476a354aee439feeaa0030ae59cc43c165b9)
This commit is contained in:
Tim Abbott 2013-11-01 13:59:05 -04:00
parent 29aef33c53
commit 0ae03eb655
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zerver/models.py
View File

@ -390,21 +390,8 @@ def get_client_cache_key(name):
return 'get_client:%s' % (make_safe_digest(name),) return 'get_client:%s' % (make_safe_digest(name),)
@cache_with_key(get_client_cache_key, timeout=3600*24*7) @cache_with_key(get_client_cache_key, timeout=3600*24*7)
@transaction.commit_on_success
def get_client(name): def get_client(name):
try:
(client, _) = Client.objects.get_or_create(name=name) (client, _) = Client.objects.get_or_create(name=name)
except IntegrityError:
# If we're racing with other threads trying to create this
# client, get_or_create will throw IntegrityError (because our
# database is enforcing the no-duplicate-objects constraint);
# in this case one should just re-fetch the object. This race
# actually happens with populate_db.
#
# Much of the rest of our code that writes to the database
# doesn't handle this duplicate object on race issue correctly :(
transaction.commit()
return Client.objects.get(name=name)
return client return client
def get_stream_cache_key(stream_name, realm): def get_stream_cache_key(stream_name, realm):