atomic_cache 0.2.1.rc2 → 0.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89d82475dddde4fb324d6f2187d47122916dc381883fedcfec2ff00204035e08
-  data.tar.gz: 34d5d998acee788561e3e49019d5983fed4226e4cf88ba7cb0d8fe7cb2bd5a3b
+  metadata.gz: becad2b31944cbd2f93353a4b5e015f8f39c6f508f605f3adcd672fd7e8482b9
+  data.tar.gz: a76b093ad299c779adabe12053731f6582eca33b169a4b05c3a2c619f8747855
 SHA512:
-  metadata.gz: e19f7c43629d01ebeceba040c818a8ae75f183245e9171d3ab39a3d302388769f263292ae04d39c1dcc01137190181f27f5628b3f091a26808c1767ce85ba24e
-  data.tar.gz: b5d0036456849d3d882227231908da8e885e1e6772f4e0b1a4b121a3690e34acd0f0b4ce5a67816c5fc62b5e053100d8c93980b0e8252f693f8737e42bed60e7
+  metadata.gz: 71ea9a439a06adde2a837132820555a564aa2168344a9b9b455fcf04e3293aa3ce147ca9a534ed97266dda92a1db09aa0cc33af22262c6997f8dca334ac0ec66
+  data.tar.gz: 3e4c87333014f120f9ef8055492886734525cbc85ef5245fe87c32a3e908ce0ab059f5ea297a6bc3c2c05517c294ac6ee7891e0caa3d3d4f44db83ea3583fc64

data/README.md

@@ -23,7 +23,7 @@ In a nutshell:
 class Foo < ActiveRecord::Base
   include AtomicCache::GlobalLMTCacheConcern
 
-  cache_class(:custom_foo)  # optional
+  force_cache_class(:custom_foo)  # optional
   cache_version(5)          # optional
 
   def active_foos(ids)

data/docs/MODEL_SETUP.md

@@ -7,13 +7,13 @@ class Foo < ActiveRecord::Base
 end
 ```
 
-### cache_class
+### force_cache_class
 By default the cache identifier for a class is set to the name of a class (ie. `self.to_s`).  In some cases it makes sense to set a custom value for the cache identifier.  In cases where a custom cache identifier is set, it's important that the identifier remain unique across the project.
 
 ```ruby
 class SuperDescriptiveDomainModelAbstractFactoryImplManager < ActiveRecord::Base
   include AtomicCache::GlobalLMTCacheConcern
-  cache_class('sddmafim')
+  force_cache_class('sddmafim')
 end
 ```
 

data/docs/PROJECT_SETUP.md

@@ -23,9 +23,10 @@ AtomicCache::DefaultConfig.configure do |config|
   config.metrics = Datadog::Statsd.new('localhost', 8125, namespace: 'cache.atomic')
 
   # note: these values can also be set in an env file for env-specific settings
-  config.namespace      = 'atom'
-  config.cache_storage  = AtomicCache::Storage::SharedMemory.new
-  config.key_storage    = AtomicCache::Storage::SharedMemory.new
+  config.namespace        = 'atom'
+  config.default_options  = { generate_ttl_ms: 500 }
+  config.cache_storage    = AtomicCache::Storage::SharedMemory.new
+  config.key_storage      = AtomicCache::Storage::SharedMemory.new
 end
 ```
 
@@ -36,7 +37,7 @@ Note that `Datadog::Statsd` is not _required_.  Adding it, however, will enable
   * `key_storage` - Storage adapter for key manager (see below)
 
 #### Optional
-  * `default_options` - Default options for every fetch call.  See [fetch options](/Ibotta/atomic_cache/blob/main/docs/USAGE.md#fetch).
+  * `default_options` - Override default options for every fetch call, unless specified at call site.  See [fetch options](/Ibotta/atomic_cache/blob/main/docs/USAGE.md#fetch).
   * `logger` - Logger instance.  Used for debug and warn logs. Defaults to nil.
   * `timestamp_formatter` - Proc to format last modified time for storage. Defaults to timestamp (`Time.to_i`)
   * `metrics` - Metrics instance. Defaults to nil.
@@ -45,6 +46,49 @@ Note that `Datadog::Statsd` is not _required_.  Adding it, however, will enable
 #### ★ Best Practice ★
 Keep the global namespace short.  For example, memcached has a limit of 250 characters for key length.
 
+#### More Complex Rails Configuration
+
+In any real-world project, the need to run multiple caching strategies or setups is likely to arise. In those cases, it's often advantageous
+to keep a DRY setup, with multiple caching clients sharing the same config. Because Rails initializers run after the environment-specific
+config files, a sane way to manage this is to keep client network settings int he config files, then reference them from the initializer.
+
+```ruby
+# config/environments/staging
+config.memcache_hosts = [ "staging.host.cache.amazonaws.com" ]
+config.cache_store_options = {
+  expires_in: 15.minutes,
+  compress: true,
+  # ...
+}
+
+# config/environments/production
+config.memcache_hosts = [ "prod1.host.cache.amazonaws.com", "prod2.host.cache.amazonaws.com" ]
+config.cache_store_options = {
+  expires_in: 1.hour,
+  compress: true,
+  # ...
+}
+
+# config/initializers/cache.rb
+AtomicCache::DefaultConfig.configure do |config|
+  if Rails.env.development? || Rails.env.test?
+    config.cache_storage  = AtomicCache::Storage::SharedMemory.new
+    config.key_storage    = AtomicCache::Storage::SharedMemory.new
+
+  elsif Rails.env.staging? || Rails.env.production?
+    # Your::Application.config will be loaded by config/environments/*
+    memcache_hosts = Your::Application.config.memcache_hosts
+    options = Your::Application.config.cache_store_options
+    
+    dc = Dalli::Client.new(memcache_hosts, options)
+    config.cache_storage  = AtomicCache::Storage::Dalli.new(dc)
+    config.key_storage    = AtomicCache::Storage::Dalli.new(dc)
+  end
+  
+  # other AtomicCache configuration...
+end
+```
+
 ## Storage Adapters
 
 ### InstanceMemory & SharedMemory

data/docs/USAGE.md

@@ -21,6 +21,14 @@ end
 
 In addition to the below options, any other options given (e.g. `expires_in`, `cache_nils`) are passed through to the underlying storage adapter.  This allows storage-specific options to be passed through (reference: [Dalli config](https://github.com/petergoldstein/dalli#configuration)).
 
+#### TTL
+Various storage clients require TTL to be expressed in different ways. The included storage adapters will unwrap the `ttl` option to an storage-specific representation.
+```ruby
+atomic_cache.fetch(ttl: 500) do
+  # generate block
+end
+```
+
 #### `generate_ttl_ms`
 _Defaults to 30 seconds._
 

data/lib/atomic_cache/atomic_cache_client.rb

@@ -27,7 +27,6 @@ module AtomicCache
       raise ArgumentError.new("`storage` required but none given") unless @storage.present?
     end
 
-
     # Attempts to fetch the given keyspace, using an optional block to generate
     # a new value when the cache is expired
     #
@@ -45,6 +44,7 @@ module AtomicCache
       value = @storage.read(key, options) if key.present?
       if !value.nil?
         metrics(:increment, 'read.present', tags: tags)
+        log(:debug, "Read value from key: '#{key}'")
         return value
       end
 
@@ -59,13 +59,13 @@ module AtomicCache
 
       # quick check back to see if the other process has finished
       # or fall back to the last known value
-      value = quick_retry(keyspace, options, tags) || last_known_value(keyspace, options, tags)
+      value = quick_retry(key, options, tags) || last_known_value(keyspace, options, tags)
       return value if value.present?
 
       # wait for the other process if a last known value isn't there
       if key.present?
         return time('wait.run', tags: tags) do
-          wait_for_new_value(key, options, tags)
+          wait_for_new_value(keyspace, options, tags)
         end
       end
 
@@ -109,10 +109,8 @@ module AtomicCache
       nil
     end
 
-    def quick_retry(keyspace, options, tags)
-      key = @timestamp_manager.current_key(keyspace)
+    def quick_retry(key, options, tags)
       duration = option(:quick_retry_ms, options, DEFAULT_quick_retry_ms)
-
       if duration.present? and key.present?
         sleep(duration.to_f / 1000)
         value = @storage.read(key, options)
@@ -136,6 +134,7 @@ module AtomicCache
         # last known key may have expired
         if !lkv.nil?
           metrics(:increment, 'last-known-value.present', tags: tags)
+          log(:debug, "Read value from last known value key: '#{lkk}'")
           return lkv
         end
 
@@ -149,7 +148,7 @@ module AtomicCache
       nil
     end
 
-    def wait_for_new_value(key, options, tags)
+    def wait_for_new_value(keyspace, options, tags)
       max_retries = option(:max_retries, options, DEFAULT_MAX_RETRIES)
       max_retries.times do |attempt|
         metrics_tags = tags.clone.push("attempt:#{attempt}")
@@ -160,6 +159,8 @@ module AtomicCache
         backoff_duration_ms = option(:backoff_duration_ms, options, backoff_duration_ms)
         sleep((backoff_duration_ms.to_f / 1000) * attempt)
 
+        # re-fetch the key each time, to make sure we're actually getting the latest key with the correct LMT
+        key = @timestamp_manager.current_key(keyspace)
         value = @storage.read(key, options)
         if !value.nil?
           metrics(:increment, 'wait.present', tags: metrics_tags)
@@ -168,7 +169,7 @@ module AtomicCache
       end
 
       metrics(:increment, 'wait.give-up')
-      log(:warn, "Giving up fetching cache key `#{key}`. Exceeded max retries (#{max_retries}).")
+      log(:warn, "Giving up waiting. Exceeded max retries (#{max_retries}).")
       nil
     end
 

data/lib/atomic_cache/concerns/global_lmt_cache_concern.rb

@@ -26,7 +26,7 @@ module AtomicCache
         end
       end
 
-      def cache_class(kls)
+      def force_cache_class(kls)
         ATOMIC_CACHE_CONCERN_MUTEX.synchronize do
           @atomic_cache_class = kls
         end

data/lib/atomic_cache/storage/dalli.rb

@@ -10,10 +10,6 @@ module AtomicCache
     class Dalli < Store
       extend Forwardable
 
-      ADD_SUCCESS = 'STORED'
-      ADD_UNSUCCESSFUL = 'NOT_STORED'
-      ADD_EXISTS = 'EXISTS'
-
       def_delegators :@dalli_client, :delete
 
       def initialize(dalli_client)
@@ -27,16 +23,17 @@ module AtomicCache
         # dalli expects time in seconds
         # https://github.com/petergoldstein/dalli/blob/b8f4afe165fb3e07294c36fb1c63901b0ed9ce10/lib/dalli/client.rb#L27
         # TODO: verify this unit is being treated correctly through the system
-        response = @dalli_client.add(key, new_value, ttl, opts)
-        response.start_with?(ADD_SUCCESS)
+        !!@dalli_client.add(key, new_value, ttl, opts)
       end
 
       def read(key, user_options={})
-        @dalli_client.read(key, user_options)
+        @dalli_client.get(key, user_options)
       end
 
       def set(key, value, user_options={})
-        @dalli_client.set(key, value, user_options)
+        ttl = user_options[:ttl]
+        user_options.delete(:ttl)
+        !!@dalli_client.set(key, value, ttl, user_options)
       end
 
     end

data/lib/atomic_cache/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AtomicCache
-  VERSION = "0.2.1.rc2"
+  VERSION = "0.3.0.rc1"
 end

data/spec/atomic_cache/concerns/global_lmt_cache_concern_spec.rb

@@ -104,12 +104,12 @@ describe 'AtomicCacheConcern' do
       class Foo2
         include AtomicCache::GlobalLMTCacheConcern
         cache_version(3)
-        cache_class('foo')
+        force_cache_class('foo')
       end
       Foo2
     end
 
-    it 'uses the given version and cache_class become part of the cache keyspace' do
+    it 'uses the given version and force_cache_class become part of the cache keyspace' do
       subject.expire_cache
       expect(key_storage.store).to have_key(:'foo:v3:lmt')
     end

data/spec/atomic_cache/integration/waiting_spec.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Integration' do
+  let(:key_storage) { AtomicCache::Storage::SharedMemory.new }
+  let(:cache_storage) { AtomicCache::Storage::SharedMemory.new }
+  let(:keyspace) { AtomicCache::Keyspace.new(namespace: 'int.waiting') }
+  let(:timestamp_manager) { AtomicCache::LastModTimeKeyManager.new(keyspace: keyspace, storage: key_storage) }
+
+  let(:generating_client) { AtomicCache::AtomicCacheClient.new(storage: cache_storage, timestamp_manager: timestamp_manager) }
+  let(:waiting_client) { AtomicCache::AtomicCacheClient.new(storage: cache_storage, timestamp_manager: timestamp_manager) }
+
+  it 'correctly waits for a key when no last know value is available' do
+    generating_thread = ClientThread.new(generating_client, keyspace)
+    generating_thread.start
+    waiting_thread = ClientThread.new(waiting_client, keyspace)
+    waiting_thread.start
+
+    generating_thread.generate
+    sleep 0.05
+    waiting_thread.fetch
+    sleep 0.05
+    generating_thread.complete
+    sleep 0.05
+
+    generating_thread.terminate
+    waiting_thread.terminate
+
+    expect(generating_thread.result).to eq([1, 2, 3])
+    expect(waiting_thread.result).to eq([1, 2, 3])
+  end
+end
+
+
+# Avert your eyes:
+# this class allows atomic client interaction to happen asynchronously so that
+# the waiting behavior of the client can be tested simultaneous to controlling how
+# long the 'generate' behavior takes
+#
+# It works by accepting an incoming 'message' which it places onto one of two queues
+class ClientThread
+  attr_reader :result
+
+  def initialize(client, keyspace)
+    @keyspace = keyspace
+    @client = client
+    @msg_queue = Queue.new
+    @generate_queue = Queue.new
+    @result = nil
+  end
+
+  def start
+    @thread = Thread.new(&method(:run))
+  end
+
+  def fetch
+    @msg_queue << :fetch
+  end
+
+  def generate
+    @msg_queue << :generate
+  end
+
+  def complete
+    @generate_queue << :complete
+  end
+
+  def terminate
+    @msg_queue << :terminate
+  end
+
+  private
+
+  def run
+    loop do
+      msg = @msg_queue.pop
+      sleep 0.001; next unless msg
+
+      case msg
+      when :terminate
+        Thread.stop
+      when :generate
+        do_generate
+      when :fetch
+        @result = @client.fetch(@keyspace)
+      end
+    end
+  end
+
+  def do_generate
+    @client.fetch(@keyspace) do
+      loop do
+        msg = @generate_queue.pop
+        sleep 0.001; next unless msg
+        break if msg == :complete
+      end
+      @result = [1, 2, 3] # generated value
+      @result
+    end
+  end
+end

data/spec/atomic_cache/storage/dalli_spec.rb

@@ -13,13 +13,20 @@ describe 'Dalli' do
   let(:dalli_client) { FakeDalli.new }
   subject { AtomicCache::Storage::Dalli.new(dalli_client) }
 
-  it 'delegates #set without options' do
-    expect(dalli_client).to receive(:set).with('key', 'value', {})
-    subject.set('key', 'value')
+  context '#set' do
+    it 'delegates #set without options' do
+      expect(dalli_client).to receive(:set).with('key', 'value', nil, {})
+      subject.set('key', 'value')
+    end
+
+    it 'delegates #set with TTL' do
+      expect(dalli_client).to receive(:set).with('key', 'value', 500, {})
+      subject.set('key', 'value', { ttl: 500 })
+    end
   end
 
   it 'delegates #read without options' do
-    expect(dalli_client).to receive(:read).with('key', {}).and_return('asdf')
+    expect(dalli_client).to receive(:get).with('key', {}).and_return('asdf')
     subject.read('key')
   end
 
@@ -30,7 +37,7 @@ describe 'Dalli' do
 
   context '#add' do
     before(:each) do
-      allow(dalli_client).to receive(:add).and_return('NOT_STORED\r\n')
+      allow(dalli_client).to receive(:add).and_return(false)
     end
 
     it 'delegates to #add with the raw option set' do
@@ -40,22 +47,17 @@ describe 'Dalli' do
     end
 
     it 'returns true when the add is successful' do
-      expect(dalli_client).to receive(:add).and_return('STORED\r\n')
+      expect(dalli_client).to receive(:add).and_return(12339031748204560384)
       result = subject.add('key', 'value', 100)
       expect(result).to eq(true)
     end
 
     it 'returns false if the key already exists' do
-      expect(dalli_client).to receive(:add).and_return('EXISTS\r\n')
+      expect(dalli_client).to receive(:add).and_return(false)
       result = subject.add('key', 'value', 100)
       expect(result).to eq(false)
     end
 
-    it 'returns false if the add fails' do
-      expect(dalli_client).to receive(:add).and_return('NOT_STORED\r\n')
-      result = subject.add('key', 'value', 100)
-      expect(result).to eq(false)
-    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atomic_cache
 version: !ruby/object:Gem::Version
-  version: 0.2.1.rc2
+  version: 0.3.0.rc1
 platform: ruby
 authors:
 - Ibotta Developers
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -171,7 +171,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-description: desc
+description: A gem which prevents the thundering herd problem through a distributed
+  lock
 email: osscompliance@ibotta.com
 executables: []
 extensions: []
@@ -200,6 +201,7 @@ files:
 - spec/atomic_cache/atomic_cache_client_spec.rb
 - spec/atomic_cache/concerns/global_lmt_cache_concern_spec.rb
 - spec/atomic_cache/default_config_spec.rb
+- spec/atomic_cache/integration/waiting_spec.rb
 - spec/atomic_cache/key/keyspace_spec.rb
 - spec/atomic_cache/key/last_mod_time_key_manager_spec.rb
 - spec/atomic_cache/storage/dalli_spec.rb
@@ -229,5 +231,9 @@ requirements: []
 rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
-summary: summary
+summary: In a nutshell:* The key of every cached value includes a timestamp* Once
+  a cache key is written to, it is never written over* When a newer version of a cached
+  value is available, it is written to a new key* When a new value is being generated
+  for a new key only 1 process is allowed to do so at a time* While the new value
+  is being generated, other processes read one key older than most recent
 test_files: []