Migrate from threading.Lock() to django-db-mutex

.github/workflows/test.yml

@@ -32,6 +32,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           python -m pip install --upgrade django~=${{ matrix.django-version }}
+          python -m pip install --upgrade django-db-mutex
           python -m pip install --upgrade requests
 
       - name: Run tests

CHANGELOG

@@ -1,5 +1,8 @@
 Unreleased
 
+* Breaking change: Migrated from `threading.Lock()` to `django-db-mutex`
+  to avoid race conditions between multiple processes.
+  Please add `'db_mutex'` to your `INSTALLED_APPS` setting.
 * Enable internationalization for URL status messages (Timo Ludwig, #125)
 * Enable re-checking after rate limit was hit (Timo Ludwig, #153)
 * Ignore raw `post_save` signal (Timo Ludwig, #106)

README.rst

@@ -35,7 +35,7 @@ Basic usage
 #. Install app to somewhere on your Python path (e.g. ``pip install
    django-linkcheck``).
 
-#. Add ``'linkcheck'`` to your ``settings.INSTALLED_APPS``.
+#. Add ``'linkcheck'`` and ``'db_mutex'`` to your ``settings.INSTALLED_APPS``.
 
 #. Add a file named ``linklists.py`` to every app (see an example in ``examples/linklists.py``) that either:
 

linkcheck/__init__.py

@@ -1,9 +1,5 @@
-import threading
 from html.parser import HTMLParser
 
-# A global lock, showing whether linkcheck is busy
-update_lock = threading.Lock()
-
 
 class Lister(HTMLParser):
 

linkcheck/apps.py

@@ -1,6 +1,7 @@
 import importlib
 
 from django.apps import AppConfig, apps
+from django.core.exceptions import ImproperlyConfigured
 from django.db.models.signals import post_delete
 
 
@@ -17,6 +18,11 @@ class BaseLinkcheckConfig(AppConfig):
     all_linklists = {}
 
     def ready(self):
+        if not apps.is_installed('db_mutex'):
+            raise ImproperlyConfigured(
+                'This library depends on django-db-mutex, '
+                'please add "db_mutex" to your INSTALLED_APPS setting.'
+            )
         self.build_linklists()
 
     def build_linklists(self):

linkcheck/listeners.py

@@ -5,12 +5,14 @@
 from queue import Empty, LifoQueue
 from threading import Thread
 
+from db_mutex import DBMutexError
+from db_mutex.db_mutex import db_mutex
 from django.apps import apps
 from django.db.models import signals as model_signals
 
 from linkcheck.models import Link, Url
 
-from . import filebrowser, update_lock
+from . import filebrowser
 from .linkcheck_settings import MAX_URL_LENGTH
 
 logger = logging.getLogger(__name__)
@@ -31,6 +33,11 @@ def linkcheck_worker(block=True):
         # An error in any task should not stop the worker from continuing with the queue
         try:
             task['target'](*task['args'], **task['kwargs'])
+        except DBMutexError:
+            # Wait and reschedule the task
+            logger.debug("Lock is busy, waiting and rescheduling the task...")
+            time.sleep(0.1)
+            tasks_queue.put(task)
         except Exception as e:
             logger.exception(
                 "%s while running %s with args=%r and kwargs=%r: %s",
@@ -74,7 +81,7 @@ def do_check_instance_links(sender, instance, wait=False):
 
         if wait:
             time.sleep(0.1)
-        with update_lock:
+        with db_mutex('linkcheck'):
             content_type = linklist_cls.content_type()
             new_links = []
             old_links = Link.objects.filter(content_type=content_type, object_id=instance.pk)

linkcheck/locale/de/LC_MESSAGES/django.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-28 23:01+0100\n"
+"POT-Creation-Date: 2023-03-19 14:38+0100\n"
 "Language: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -210,19 +210,19 @@ msgstr "Letze"
 msgid "Show"
 msgstr "Anzeigen"
 
-#: templates/linkcheck/report.html:126 views.py:83
+#: templates/linkcheck/report.html:126 views.py:85
 msgid "Valid links"
 msgstr "Gültige Links"
 
-#: templates/linkcheck/report.html:127 views.py:92
+#: templates/linkcheck/report.html:127 views.py:94
 msgid "Broken links"
 msgstr "Ungültige Links"
 
-#: templates/linkcheck/report.html:128 views.py:86
+#: templates/linkcheck/report.html:128 views.py:88
 msgid "Untested links"
 msgstr "Ungetestete Links"
 
-#: templates/linkcheck/report.html:129 views.py:89
+#: templates/linkcheck/report.html:129 views.py:91
 msgid "Ignored links"
 msgstr "Ignorierte Links"
 
@@ -268,5 +268,19 @@ msgstr "Nicht ignorieren"
 msgid "Redirects to"
 msgstr "Leitet weiter zu"
 
+#: views.py:175
+msgid "We've found {} broken link."
+msgid_plural "We've found {} broken links."
+msgstr[0] "Es wurde {} ungültiger Link gefunden."
+msgstr[1] "Es wurden {} ungültige Links gefunden."
+
+#: views.py:180
+msgid "View/fix broken links"
+msgstr "Ungültige Links anzeigen/beheben"
+
+#: views.py:186
+msgid "Still checking. Please refresh this page in a short while."
+msgstr "Es wird noch geprüft. Bitte aktualisieren Sie diese Seite später."
+
 #~ msgid "Link to section on same page"
 #~ msgstr "Link zu Abschnitt auf derselben Seite"

linkcheck/tests/test_linkcheck.py

@@ -3,6 +3,7 @@
 from io import StringIO
 from unittest.mock import patch
 
+from db_mutex import DBMutexError
 from django.apps import apps
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -996,6 +997,28 @@ def passing():
             'args=() and kwargs={}: Failing task'
         )
 
+    def test_reschedule_busy_lock(self):
+        global attempt
+        attempt = 0
+
+        def busy():
+            global attempt
+            if attempt < 5:
+                attempt += 1
+                raise DBMutexError("Could not acquire lock")
+
+        tasks_queue.put({
+            'target': busy,
+            'args': (),
+            'kwargs': {},
+        })
+        with self.assertLogs(level='DEBUG') as cm:
+            linkcheck_worker(block=False)
+        self.assertEqual(
+            cm.output,
+            ['DEBUG:linkcheck.listeners:Lock is busy, waiting and rescheduling the task...'] * 5
+        )
+
 
 class ViewTestCase(TestCase):
     def setUp(self):

linkcheck/views.py

@@ -1,6 +1,8 @@
 from itertools import groupby
 from operator import itemgetter
 
+from db_mutex import DBMutexError
+from db_mutex.db_mutex import db_mutex
 from django import forms
 from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib.contenttypes.models import ContentType
@@ -11,8 +13,8 @@
 from django.templatetags.static import static
 from django.urls import NoReverseMatch, reverse
 from django.utils.translation import gettext as _
+from django.utils.translation import ngettext
 
-from linkcheck import update_lock
 from linkcheck.linkcheck_settings import RESULTS_PER_PAGE
 from linkcheck.models import Link
 from linkcheck.utils import get_coverage_data
@@ -163,21 +165,25 @@ def get_jquery_min_js():
 
 
 def get_status_message():
-    if update_lock.locked():
-        return "Still checking. Please refresh this page in a short while. "
-    else:
-        broken_links = Link.objects.filter(ignore=False, url__status=False).count()
-        if broken_links:
-            return (
-                "<span style='color: red;'>We've found {} broken link{}.</span><br>"
-                "<a href='{}'>View/fix broken links</a>".format(
-                    broken_links,
-                    "s" if broken_links > 1 else "",
-                    reverse('linkcheck_report'),
+    try:
+        with db_mutex('linkcheck'):
+            broken_links = Link.objects.filter(ignore=False, url__status=False).count()
+            if broken_links:
+                return (
+                    "<span style='color: red;'>{}</span><br><a href='{}'>{}</a>".format(
+                        ngettext(
+                            "We've found {} broken link.",
+                            "We've found {} broken links.",
+                            broken_links
+                        ).format(broken_links),
+                        reverse('linkcheck_report'),
+                        _('View/fix broken links'),
+                    )
                 )
-            )
-        else:
-            return ''
+            else:
+                return ''
+    except DBMutexError:
+        return _('Still checking. Please refresh this page in a short while.')
 
 
 def is_ajax(request):

runtests.py

@@ -13,7 +13,7 @@
         'INSTALLED_APPS': [
             'django.contrib.admin', 'django.contrib.auth',
             'django.contrib.sessions', 'django.contrib.contenttypes',
-            'django.contrib.messages',
+            'django.contrib.messages', 'db_mutex',
             'linkcheck', 'linkcheck.tests.sampleapp',
         ],
         'ROOT_URLCONF': "linkcheck.tests.urls",

setup.py

@@ -6,6 +6,7 @@
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
+
 setup(
     name='django-linkcheck',
     version='2.1.0',
@@ -18,7 +19,7 @@ def read(fname):
     url='https://github.com/DjangoAdminHackers/django-linkcheck',
     packages=find_packages(),
     include_package_data=True,
-    install_requires=['django', 'requests'],
+    install_requires=['django', 'django-db-mutex', 'requests'],
     extras_require={
         "dev": ["flake8", "isort", "pre-commit"],
     },