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

only populate full local DynamicSettings cache when expired 

rather than on every fetch call

closes #LA-900

Change-Id: If603066732e7e96aa6ad6fb4614f756c0433de42
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/233042
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Clint Furse <cfurse@instructure.com>
This commit is contained in:
James Williams 2020-04-06 10:26:26 -06:00
parent 1d86c83844
commit 1dc9628f98
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/canvas/dynamic_settings/prefix_proxy.rb
View File

@ -78,13 +78,21 @@ module Canvas
["global", tree, service, prefix, key].compact.join("/"), ["global", tree, service, prefix, key].compact.join("/"),
].uniq - keys ].uniq - keys
# pre-cache an entire tree # try to get the local cache first right away
tree_key = [tree, service, environment].compact.join("/") keys.each do |full_key|
subtree = LocalCache.fetch(CACHE_KEY_PREFIX + tree_key + '/', expires_in: ttl) do result = LocalCache.fetch(CACHE_KEY_PREFIX + full_key)
result = @kv_client.get(tree_key, :recurse, :stale) return result if result
result.values if result&.status == 200 end
# okay now pre-cache an entire tree
tree_key = [tree, service, environment].compact.join("/")
LocalCache.fetch(CACHE_KEY_PREFIX + tree_key + '/', expires_in: ttl) do
result = @kv_client.get(tree_key, :recurse, :stale)
if result&.status == 200
populate_cache(tree_key, result.values, ttl) # only populate recursively when we missed
result.values
end
end end
populate_cache(tree_key, subtree, ttl)
keys.each do |full_key| keys.each do |full_key|
# these keys will have been populated (or not!) above; don't # these keys will have been populated (or not!) above; don't

1
spec/lib/canvas/dynamic_settings/prefix_proxy_spec.rb
View File

@ -57,6 +57,7 @@ module Canvas
end end
it 'must use the dynamic settings cache for previously fetched values' do it 'must use the dynamic settings cache for previously fetched values' do
expect(LocalCache).to receive(:fetch).with(DynamicSettings::CACHE_KEY_PREFIX + 'foo/bar/baz').ordered
expect(LocalCache).to receive(:fetch).with(DynamicSettings::CACHE_KEY_PREFIX + '/', expires_in: 3.minutes).ordered expect(LocalCache).to receive(:fetch).with(DynamicSettings::CACHE_KEY_PREFIX + '/', expires_in: 3.minutes).ordered
expect(LocalCache).to receive(:fetch).with(DynamicSettings::CACHE_KEY_PREFIX + 'foo/bar/baz').ordered expect(LocalCache).to receive(:fetch).with(DynamicSettings::CACHE_KEY_PREFIX + 'foo/bar/baz').ordered
expect(LocalCache).to receive(:fetch).with(DynamicSettings::CACHE_KEY_PREFIX + 'global/foo/bar/baz', expires_in: 3.minutes).ordered expect(LocalCache).to receive(:fetch).with(DynamicSettings::CACHE_KEY_PREFIX + 'global/foo/bar/baz', expires_in: 3.minutes).ordered