Skip to content

Commit 2aaeced

Browse files
committed
[IMP] queue_job: make sorting more explicit
1 parent dd63c60 commit 2aaeced

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

queue_job/jobrunner/runner.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ def get_db_names(self):
418418
db_names = config["db_name"].split(",")
419419
else:
420420
db_names = odoo.service.db.list_dbs(True)
421-
return sorted(db_names)
421+
return db_names
422422

423423
def close_databases(self, remove_jobs=True):
424424
for db_name, db in self.db_by_name.items():
@@ -431,7 +431,8 @@ def close_databases(self, remove_jobs=True):
431431
self.db_by_name = {}
432432

433433
def initialize_databases(self):
434-
for db_name in self.get_db_names():
434+
for db_name in sorted(self.get_db_names()):
435+
# sorting is important to avoid deadlocks in acquiring the master lock
435436
db = Database(db_name)
436437
if db.has_queue_job:
437438
self.db_by_name[db_name] = db

0 commit comments

Comments
 (0)