Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Add row-level locking for group updates

Jan Sandbrink8f3179961b5d
diff --git a/modules/openid_connect/app/services/openid_connect/groups/sync_service.rb b/modules/openid_connect/app/services/openid_connect/groups/sync_service.rb
index 97f54f2621f..783b5a0dfc2 100644
--- a/modules/openid_connect/app/services/openid_connect/groups/sync_service.rb
+++ b/modules/openid_connect/app/services/openid_connect/groups/sync_service.rb
@@ -95,12 +95,13 @@ module OpenIDConnect
end
def update_group_users(group)
- # TODO: is that service well suited for many small group changes?
- current_user_ids = group.group_users.pluck(:user_id)
- new_user_ids = yield current_user_ids
- @result.merge!(
- ::Groups::UpdateService.new(user: User.system, model: group).call(user_ids: new_user_ids)
- )
+ ActiveRecord::Base.transaction do
+ current_user_ids = group.group_users.lock.pluck(:user_id)
+ new_user_ids = yield current_user_ids
+ @result.merge!(
+ ::Groups::UpdateService.new(user: User.system, model: group).call(user_ids: new_user_ids)
+ )
+ end
end
def authentication_provider