From eefcc7034925669ca90b73ef3751aa0d9a68ca7e Mon Sep 17 00:00:00 2001
From: Pierre Verkest <pierreverkest84@gmail.com>
Date: Fri, 14 Mar 2025 00:18:38 +0100
Subject: [PATCH 1/2] =?UTF-8?q?[FIX]=C2=A0queue=5Fjob:=20job=20runner=20op?=
 =?UTF-8?q?en=20pipe=20that=20are=20never=20closed=20properly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

this make a lot of open file descriptors that we got the limit while instentiate
jobrunner from queue_job_cron_jobrunner in the current channel implementation
https://github.com/OCA/queue/pull/750
---
 queue_job/jobrunner/runner.py         | 11 ++++++
 queue_job/tests/test_runner_runner.py | 49 +++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/queue_job/jobrunner/runner.py b/queue_job/jobrunner/runner.py
index 46cb3b3d82..04b163bd4a 100644
--- a/queue_job/jobrunner/runner.py
+++ b/queue_job/jobrunner/runner.py
@@ -383,6 +383,17 @@ def __init__(
         self._stop = False
         self._stop_pipe = os.pipe()
 
+    def __del__(self):
+        # pylint: disable=except-pass
+        try:
+            os.close(self._stop_pipe[0])
+        except OSError:
+            pass
+        try:
+            os.close(self._stop_pipe[1])
+        except OSError:
+            pass
+
     @classmethod
     def from_environ_or_config(cls):
         scheme = os.environ.get("ODOO_QUEUE_JOB_SCHEME") or queue_job_config.get(
diff --git a/queue_job/tests/test_runner_runner.py b/queue_job/tests/test_runner_runner.py
index c6486e27ef..131ce6322d 100644
--- a/queue_job/tests/test_runner_runner.py
+++ b/queue_job/tests/test_runner_runner.py
@@ -3,8 +3,57 @@
 
 # pylint: disable=odoo-addons-relative-import
 # we are testing, we want to test as we were an external consumer of the API
+import os
+
+from odoo.tests import BaseCase, tagged
+
 from odoo.addons.queue_job.jobrunner import runner
 
 from .common import load_doctests
 
 load_tests = load_doctests(runner)
+
+
+@tagged("-at_install", "post_install")
+class TestRunner(BaseCase):
+    @classmethod
+    def _is_open_file_descriptor(cls, fd):
+        try:
+            os.fstat(fd)
+            return True
+        except OSError:
+            return False
+
+    def test_runner_file_descriptor(self):
+        a_runner = runner.QueueJobRunner.from_environ_or_config()
+
+        read_fd, write_fd = a_runner._stop_pipe
+        self.assertTrue(self._is_open_file_descriptor(read_fd))
+        self.assertTrue(self._is_open_file_descriptor(write_fd))
+
+        del a_runner
+
+        self.assertFalse(self._is_open_file_descriptor(read_fd))
+        self.assertFalse(self._is_open_file_descriptor(write_fd))
+
+    def test_runner_file_closed_read_descriptor(self):
+        a_runner = runner.QueueJobRunner.from_environ_or_config()
+
+        read_fd, write_fd = a_runner._stop_pipe
+        os.close(read_fd)
+
+        del a_runner
+
+        self.assertFalse(self._is_open_file_descriptor(read_fd))
+        self.assertFalse(self._is_open_file_descriptor(write_fd))
+
+    def test_runner_file_closed_write_descriptor(self):
+        a_runner = runner.QueueJobRunner.from_environ_or_config()
+
+        read_fd, write_fd = a_runner._stop_pipe
+        os.close(write_fd)
+
+        del a_runner
+
+        self.assertFalse(self._is_open_file_descriptor(read_fd))
+        self.assertFalse(self._is_open_file_descriptor(write_fd))

From 391b6b250abf0992e1bfd58adc1c2b506bfe76e3 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@camptocamp.com>
Date: Mon, 26 May 2025 15:24:51 +0200
Subject: [PATCH 2/2] [IMP] queue_job: add Priority to Group-By and search

---
 queue_job/models/queue_job.py       | 2 +-
 queue_job/views/queue_job_views.xml | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/queue_job/models/queue_job.py b/queue_job/models/queue_job.py
index c4f1faaef5..23254fef54 100644
--- a/queue_job/models/queue_job.py
+++ b/queue_job/models/queue_job.py
@@ -89,7 +89,7 @@ class QueueJob(models.Model):
     func_string = fields.Char(string="Task", readonly=True)
 
     state = fields.Selection(STATES, readonly=True, required=True, index=True)
-    priority = fields.Integer()
+    priority = fields.Integer(aggregator=False)
     exc_name = fields.Char(string="Exception", readonly=True)
     exc_message = fields.Char(string="Exception Message", readonly=True, tracking=True)
     exc_info = fields.Text(string="Exception Info", readonly=True)
diff --git a/queue_job/views/queue_job_views.xml b/queue_job/views/queue_job_views.xml
index ac53afe6a5..94cd9a8047 100644
--- a/queue_job/views/queue_job_views.xml
+++ b/queue_job/views/queue_job_views.xml
@@ -163,6 +163,7 @@
                 <!-- pylint: disable=duplicate-xml-fields -->
                 <field name="date_done" />
                 <field name="exec_time" />
+                <field name="priority" optional="hide" />
                 <field name="exc_name" />
                 <field name="exc_message" />
                 <field name="uuid" />
@@ -207,6 +208,7 @@
                 <field name="channel" />
                 <field name="job_function_id" />
                 <field name="model_name" />
+                <field name="priority" />
                 <field name="exc_name" />
                 <field name="exc_message" />
                 <field name="exc_info" />
@@ -279,6 +281,11 @@
                         string="State"
                         context="{'group_by': 'state'}"
                     />
+                    <filter
+                        name="group_by_priority"
+                        string="Priority"
+                        context="{'group_by': 'priority'}"
+                    />
                     <filter
                         name="group_by_model_name"
                         string="Model"