[fix] Add logging and regression test for update_config self-match fix

Author: mn-ram

openwisp_controller/connection/tasks.py

@@ -53,6 +53,10 @@ def update_config(self, device_id):
         logger.warning(f'update_config("{device_id}") failed: {e}')
         return
     if _is_update_in_progress(device_id, current_task_id=self.request.id):
+        logger.info(
+            f"Skipping update_config for device {device_id}"
+            " because another update task is already running"
+        )
         return
     try:
         device_conn = DeviceConnection.get_working_connection(device)

openwisp_controller/connection/tests/test_models.py

@@ -21,7 +21,7 @@
 )
 from ..exceptions import NoWorkingDeviceConnectionError
 from ..signals import is_working_changed
-from ..tasks import _TASK_NAME, update_config
+from ..tasks import _TASK_NAME, _is_update_in_progress, update_config
 from .utils import CreateConnectionsMixin
 
 Config = load_model("config", "Config")
@@ -1047,6 +1047,25 @@ def test_device_update_config_in_progress(
             mocked_get_working_connection.assert_not_called()
             update_config.assert_not_called()
 
+    def test_update_in_progress_ignores_current_task(self):
+        """Regression test: _is_update_in_progress must not match the
+        currently running task, which would cause it to skip itself."""
+        conf = self._prepare_conf_object()
+        with mock.patch("celery.app.control.Inspect.active") as mocked_active:
+            mocked_active.return_value = {
+                "worker1": [
+                    {
+                        "name": _TASK_NAME,
+                        "args": [str(conf.device.pk)],
+                        "id": "current-task-id",
+                    }
+                ]
+            }
+            result = _is_update_in_progress(
+                conf.device.pk, current_task_id="current-task-id"
+            )
+            self.assertFalse(result)
+
     @mock.patch("time.sleep")
     @mock.patch.object(DeviceConnection, "update_config")
     @mock.patch.object(DeviceConnection, "get_working_connection")