Simplify job env management

Author: guewen

queue_job/controllers/main.py

@@ -12,7 +12,7 @@
 from psycopg2 import OperationalError, errorcodes
 from werkzeug.exceptions import BadRequest, Forbidden
 
-from odoo import SUPERUSER_ID, _, api, http, registry, tools
+from odoo import SUPERUSER_ID, _, api, http, tools
 from odoo.service.model import PG_CONCURRENCY_ERRORS_TO_RETRY
 from odoo.tools import config
 
@@ -149,8 +149,7 @@ def _enqueue_dependent_jobs(cls, env, job):
     def _runjob(cls, env: api.Environment, job: Job) -> None:
         def retry_postpone(job, message, seconds=None):
             job.env.clear()
-            with registry(job.env.cr.dbname).cursor() as new_cr:
-                job.env = api.Environment(new_cr, SUPERUSER_ID, {})
+            with job.in_temporary_env():
                 job.postpone(result=message, seconds=seconds)
                 job.set_pending(reset_retry=False)
                 job.store()
@@ -194,8 +193,7 @@ def retry_postpone(job, message, seconds=None):
             traceback_txt = buff.getvalue()
             _logger.error(traceback_txt)
             job.env.clear()
-            with registry(job.env.cr.dbname).cursor() as new_cr:
-                job.env = job.env(cr=new_cr)
+            with job.in_temporary_env():
                 vals = cls._get_failure_values(job, traceback_txt, orig_exception)
                 job.set_failed(**vals)
                 job.store()

queue_job/job.py

@@ -505,7 +505,7 @@ def perform(self):
         self.retry += 1
         try:
             if self.job_config.allow_commit:
-                env_context_manager = self._with_temporary_env()
+                env_context_manager = self.in_temporary_env()
             else:
                 env_context_manager = nullcontext()
             with env_context_manager:
@@ -530,14 +530,14 @@ def perform(self):
         return self.result
 
     @contextmanager
-    def _with_temporary_env(self):
+    def in_temporary_env(self):
         with self.env.registry.cursor() as new_cr:
-            env = self.recordset.env
-            self.recordset = self.recordset.with_env(env(cr=new_cr))
+            env = self.env
+            self._env = env(cr=new_cr)
             try:
                 yield
             finally:
-                self.recordset = self.recordset.with_env(env)
+                self._env = env
 
     def _get_common_dependent_jobs_query(self):
         return """
@@ -705,7 +705,7 @@ def env(self):
         return self.recordset.env
 
     @env.setter
-    def env(self, env):
+    def _env(self, env):
         self.recordset = self.recordset.with_env(env)
 
     @property
@@ -772,7 +772,7 @@ def model_name(self):
 
     @property
     def user_id(self):
-        return self.recordset.env.uid
+        return self.env.uid
 
     @property
     def eta(self):