Skip to content

Commit 2631808

Browse files
committed
[IMP] queue_job: make sorting more explicit
1 parent c592ed8 commit 2631808

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

queue_job/jobrunner/runner.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ def get_db_names(self):
466466
db_names = config["db_name"].split(",")
467467
else:
468468
db_names = odoo.service.db.list_dbs(True)
469-
return sorted(db_names)
469+
return db_names
470470

471471
def close_databases(self, remove_jobs=True):
472472
for db_name, db in self.db_by_name.items():
@@ -479,7 +479,8 @@ def close_databases(self, remove_jobs=True):
479479
self.db_by_name = {}
480480

481481
def initialize_databases(self):
482-
for db_name in self.get_db_names():
482+
for db_name in sorted(self.get_db_names()):
483+
# sorting is important to avoid deadlocks in acquiring the master lock
483484
db = Database(db_name)
484485
if db.has_queue_job:
485486
self.db_by_name[db_name] = db

0 commit comments

Comments
 (0)