ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve feature flag to settings datafixup migration performance 

* don't run migration in transaction
* skip shadow root account records on default shard
* preload flags in batches
* limit recursive cache invalidation jobs

Change-Id: I7a19b724d76bdc8be9a14b0d01c76810b685da3d
Reviewed-on: https://gerrit.instructure.com/211415
Tested-by: Jenkins
Reviewed-by: Rex Fleischer <rfleischer@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
James Williams 2019-09-30 06:36:29 -06:00
parent 5b4ffa859a
commit bd33394fe6
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/migrate/20190829161540_migrate_usage_rights_and_course_catalog.rb
View File

@ -18,6 +18,7 @@
class MigrateUsageRightsAndCourseCatalog < ActiveRecord::Migration[5.2]
tag :predeploy
disable_ddl_transaction!
def change
DataFixup::MoveFeatureFlagsToSettings.run(:course_catalog, "RootAccount", :enable_course_catalog)

29
lib/data_fixup/move_feature_flags_to_settings.rb
View File

@ -20,12 +20,17 @@ module DataFixup::MoveFeatureFlagsToSettings
def self.run(feature_flag_name, context_going_to, setting_name)
case context_going_to
when "RootAccount"
Account.root_accounts.find_each do |context|
Account.root_accounts.non_shadow.find_each do |context|
figure_setting_from_override(context, feature_flag_name, setting_name, inherited: false)
end
when "AccountAndCourseInherited"
Account.root_accounts.find_each do |root_account|
migrate_ff_overrides_to_inherited_recurse(root_account, feature_flag_name, setting_name)
Account.root_accounts.non_shadow.find_each do |root_account|
Account.suspend_callbacks(:invalidate_caches_if_changed) do
migrate_ff_overrides_to_inherited_recurse(root_account, feature_flag_name, setting_name)
end
Rails.cache.delete([feature_flag_name, root_account.global_id].cache_key)
# queue one job on the root account to clear all the caches recursively
Account.send_later_if_production(:invalidate_inherited_caches, root_account, [feature_flag_name])
end
else
raise "invalid setting level"
@ -36,17 +41,25 @@ module DataFixup::MoveFeatureFlagsToSettings
figure_setting_from_override(account, feature_flag_name, setting_name, inherited: true)
return if account.settings.dig(setting_name, :locked)
account.sub_accounts.find_each do |sub_account|
migrate_ff_overrides_to_inherited_recurse(sub_account, feature_flag_name, setting_name)
account.sub_accounts.find_in_batches do |sub_accounts|
ActiveRecord::Associations::Preloader.new.preload(sub_accounts, :feature_flags, FeatureFlag.where(:feature => feature_flag_name))
sub_accounts.each do |sub_account|
migrate_ff_overrides_to_inherited_recurse(sub_account, feature_flag_name, setting_name)
end
end
account.courses.find_each do |course|
figure_setting_from_override(course, feature_flag_name, setting_name, inherited: false)
account.courses.find_in_batches do |courses|
ActiveRecord::Associations::Preloader.new.preload(courses, :feature_flags, FeatureFlag.where(:feature => feature_flag_name))
courses.each do |course|
figure_setting_from_override(course, feature_flag_name, setting_name, inherited: false)
end
end
end
private_class_method :migrate_ff_overrides_to_inherited_recurse
def self.figure_setting_from_override(context, feature_flag_name, setting_name, inherited:)
override = context.feature_flags.where(:feature => feature_flag_name.to_s).take
override = context.feature_flags.loaded? ?
context.feature_flags.detect{|ff| ff.feature == feature_flag_name.to_s} :
context.feature_flags.where(:feature => feature_flag_name.to_s).take
override_value = nil
if override
case override.state