Skip to content

Commit b65bbc6

Browse files
committed
[IMP] queue_job: make sorting more explicit
1 parent deecd27 commit b65bbc6

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

queue_job/jobrunner/runner.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ def get_db_names(self):
427427
db_names = config["db_name"].split(",")
428428
else:
429429
db_names = odoo.service.db.list_dbs(True)
430-
return sorted(db_names)
430+
return db_names
431431

432432
def close_databases(self, remove_jobs=True):
433433
for db_name, db in self.db_by_name.items():
@@ -440,7 +440,8 @@ def close_databases(self, remove_jobs=True):
440440
self.db_by_name = {}
441441

442442
def initialize_databases(self):
443-
for db_name in self.get_db_names():
443+
for db_name in sorted(self.get_db_names()):
444+
# sorting is important to avoid deadlocks in acquiring the master lock
444445
db = Database(db_name)
445446
if db.has_queue_job:
446447
self.db_by_name[db_name] = db

0 commit comments

Comments
 (0)