From 2639afe2a23478fb167b5f7c2f80aed701949f7b Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Wed, 16 Aug 2023 15:39:30 +0200 Subject: [PATCH 1/2] Allow more retries on activitystatus deadlock issues --- app/models/activity.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/activity.rb b/app/models/activity.rb index e9b7e6e428..e4bfddc984 100644 --- a/app/models/activity.rb +++ b/app/models/activity.rb @@ -446,14 +446,14 @@ def activity_status_for(user, series = nil) end def activity_status_for!(user, series = nil) - first_try = true + tries = 0 begin ActivityStatus.find_or_create_by(activity: self, series: series, user: user) rescue StandardError # https://github.com/dodona-edu/dodona/issues/1877 - raise unless first_try + raise unless tries < 3 - first_try = false + tries += 1 retry end end From 25a8ed44105589bed64dc49353fb1fe9494444ae Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Wed, 16 Aug 2023 15:44:14 +0200 Subject: [PATCH 2/2] Update link with context to current pr --- app/models/activity.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/activity.rb b/app/models/activity.rb index e4bfddc984..8836913da8 100644 --- a/app/models/activity.rb +++ b/app/models/activity.rb @@ -450,7 +450,7 @@ def activity_status_for!(user, series = nil) begin ActivityStatus.find_or_create_by(activity: self, series: series, user: user) rescue StandardError - # https://github.com/dodona-edu/dodona/issues/1877 + # https://github.com/dodona-edu/dodona/pull/4903 raise unless tries < 3 tries += 1