Ticket #5632: dbmultithreaded2.diff

django/db/models/base.py

@@ -6 +6 @@
 from django.db.models.fields.related import OneToOneRel, ManyToOneRel
 from django.db.models.query import delete_objects
 from django.db.models.options import Options, AdminOptions
-from django.db import connection, transaction
+from django.db import connection, transaction, mutex
 from django.db.models import signals
 from django.db.models.loading import register_models, get_model
 from django.dispatch import dispatcher
@@ -275 +275 @@
         dispatcher.send(signal=signals.post_save, sender=self.__class__,
                         instance=self, created=(not record_exists), raw=raw)
 
+    save = mutex(save)
     save.alters_data = True
 
     def validate(self):
@@ -334 +335 @@
         # Actually delete the objects
         delete_objects(seen_objs)
 
+    delete = mutex(delete)
     delete.alters_data = True
 
     def _get_FIELD_display(self, field):

django/db/models/fields/related.py

@@ -1 @@
-from django.db import connection, transaction
+from django.db import connection, transaction, mutex
 from django.db.models import signals, get_model
 from django.db.models.fields import AutoField, Field, IntegerField, PositiveIntegerField, PositiveSmallIntegerField, get_ul_class
 from django.db.models.related import RelatedObject
@@ -254 +254 @@
                 for obj in objs:
                     setattr(obj, rel_field.name, instance)
                     obj.save()
+            add = mutex(add)
             add.alters_data = True
 
             def create(self, **kwargs):
                 new_obj = self.model(**kwargs)
                 self.add(new_obj)
                 return new_obj
+            create = mutex(create)
             create.alters_data = True
 
             # remove() and clear() are only provided if the ForeignKey can have a value of null.
@@ -273 +275 @@
                             obj.save()
                         else:
                             raise rel_field.rel.to.DoesNotExist, "%r is not related to %r." % (obj, instance)
+                remove = mutex(remove)
                 remove.alters_data = True
 
                 def clear(self):
                     for obj in self.all():
                         setattr(obj, rel_field.name, None)
                         obj.save()
+                clear = mutex(clear)
                 clear.alters_data = True
 
         manager = RelatedManager()
@@ -325 +329 @@
             # If this is a symmetrical m2m relation to self, add the mirror entry in the m2m table
             if self.symmetrical:
                 self._add_items(self.target_col_name, self.source_col_name, *objs)
+        add = mutex(add)
         add.alters_data = True
 
         def remove(self, *objs):
@@ -333 +338 @@
             # If this is a symmetrical m2m relation to self, remove the mirror entry in the m2m table
             if self.symmetrical:
                 self._remove_items(self.target_col_name, self.source_col_name, *objs)
+        remove = mutex(remove)
         remove.alters_data = True
 
         def clear(self):
@@ -341 +347 @@
             # If this is a symmetrical m2m relation to self, clear the mirror entry in the m2m table
             if self.symmetrical:
                 self._clear_items(self.target_col_name)
+        clear = mutex(clear)
         clear.alters_data = True
 
         def create(self, **kwargs):
@@ -348 +355 @@
             new_obj.save()
             self.add(new_obj)
             return new_obj
+        create = mutex(create)
         create.alters_data = True
 
         def _add_items(self, source_col_name, target_col_name, *objs):

django/db/models/query.py

@@ -1 +1 @@
 from django.conf import settings
-from django.db import connection, transaction, IntegrityError
+from django.db import connection, transaction, IntegrityError, mutex
 from django.db.models.fields import DateField, FieldDoesNotExist
 from django.db.models import signals, loading
 from django.dispatch import dispatcher
@@ -273 +273 @@
         obj = self.model(**kwargs)
         obj.save()
         return obj
+    create = mutex(create)
 
     def get_or_create(self, **kwargs):
         """
@@ -293 +294 @@
                 return obj, True
             except IntegrityError, e:
                 return self.get(**kwargs), False
+    get_or_create = mutex(get_or_create)
 
     def latest(self, field_name=None):
         """
@@ -354 +356 @@
 
         # Clear the result cache, in case this QuerySet gets reused.
         self._result_cache = None
+    delete = mutex(delete)
     delete.alters_data = True
 
     ##################################################

django/db/__init__.py

@@ -1 +1 @@
 import os
+import threading
 from django.conf import settings
 from django.core import signals
 from django.core.exceptions import ImproperlyConfigured
@@ -68 +69 @@
     from django.db import transaction
     transaction.rollback_unless_managed()
 dispatcher.connect(_rollback_on_exception, signal=signals.got_request_exception)
+
+# Decorate data-modifying db functions to use a threading.RLock
+__lock = threading.RLock()
+def mutex(func):
+    def decorated(*args, **kwargs):
+        __lock.acquire()
+        try:
+            func(*args, **kwargs)
+        except:
+            __lock.release()
+            raise
+        __lock.release()
+    return decorated
+