makara 0.3.10 → 0.4.0

data/spec/proxy_spec.rb

@@ -41,20 +41,57 @@ describe Makara::Proxy do
     expect(proxy.irespondtothis).to eq('hello!')
   end
 
-  it 'should use master if manually forced' do
-    proxy = klass.new(config(1, 2))
+  describe '#stick_to_master' do
+    let(:proxy) { klass.new(config(1, 2)) }
 
-    expect(proxy.master_for?('select * from users')).to eq(false)
+    it 'should use master if manually forced' do
+      expect(proxy.master_for?('select * from users')).to eq(false)
 
-    proxy.stick_to_master!
+      proxy.stick_to_master!
 
-    expect(proxy.master_for?('select * from users')).to eq(true)
-  end
+      expect(proxy.master_for?('select * from users')).to eq(true)
+    end
+
+    it 'should persist stickiness by default' do
+      now = Time.now
+      proxy.stick_to_master!
+
+      next_context = Makara::Context.next
+      expect(next_context[proxy.id]).to be >= (now + 5).to_f
+
+      proxy = klass.new(config(1, 2))
+      expect(proxy.master_for?('select * from users')).to eq(true)
+    end
 
+    it 'optionally skips stickiness persistence, so it applies only to the current request' do
+      now = Time.now
+      proxy.stick_to_master!(false)
+
+      expect(proxy.master_for?('select * from users')).to eq(true)
+      next_context = Makara::Context.next
+      expect(next_context).to be_nil # Nothing to persist, so context is empty
+
+      proxy = klass.new(config(1, 2))
+      expect(proxy.master_for?('select * from users')).to eq(false)
+    end
+
+    it 'supports a float master_ttl for stickiness duration' do
+      now = Time.now
+      config = config(1, 2).dup
+      config[:makara][:master_ttl] = 0.5
+      proxy = klass.new(config)
+
+      proxy.stick_to_master!
+
+      next_context = Makara::Context.next
+      expect(next_context[proxy.id]).to be >= (now + 0.5).to_f
+      expect(next_context[proxy.id]).to be < (now + 1).to_f
+    end
+  end
 
-  context '#appropriate_pool' do
 
-    let(:proxy){ klass.new(config(1,1)) }
+  describe '#appropriate_pool' do
+    let(:proxy) { klass.new(config(1,1)) }
 
     it 'should be sticky by default' do
       expect(proxy.sticky).to eq(true)
@@ -104,41 +141,23 @@ describe Makara::Proxy do
       expect(proxy.master_for?('select * from users')).to eq(false)
     end
 
-    # if the context changes we should still use master until the previous context is no longer relevant
-    it 'should release master if the context changes and enough time passes' do
+    it "should not release master if it was stuck in the same request (no context changes yet)" do
       expect(proxy.master_for?('insert into users values (a,b,c)')).to eq(true)
       expect(proxy.master_for?('select * from users')).to eq(true)
 
-      change_context
-
       Timecop.travel Time.now + 10 do
-        expect(proxy.master_for?('select * from users')).to eq(false)
+        # master_ttl has passed but we are still in the same request, so current context
+        # is still relevant
+        expect(proxy.master_for?('select * from users')).to eq(true)
       end
     end
 
-    it 'should not release master if the previous context is still relevant' do
+    it 'should release master if all stuck connections are released' do
       expect(proxy.master_for?('insert into users values (a,b,c)')).to eq(true)
       expect(proxy.master_for?('select * from users')).to eq(true)
 
-      roll_context
-
-      proxy.master_for?('select * from users')
-      expect(proxy.master_for?('select * from users')).to eq(true)
-
-      Timecop.travel Time.now + 10 do
-        # cache is expired but context has not changed
-        expect(proxy.master_for?('select * from users')).to eq(true)
-
-        roll_context
+      Makara::Context.release_all
 
-        expect(proxy.master_for?('select * from users')).to eq(false)
-      end
-    end
-
-    it 'should release master if context changes enough' do
-      expect(proxy.master_for?('insert into users values (a,b,c)')).to eq(true)
-      roll_context
-      roll_context
       expect(proxy.master_for?('select * from users')).to eq(false)
     end
 
@@ -188,9 +207,5 @@ describe Makara::Proxy do
       proxy.slave_pool.connections.each{|con| expect(con._makara_blacklisted?).to eq(false) }
       proxy.master_pool.connections.each{|con| expect(con._makara_blacklisted?).to eq(false) }
     end
-
   end
-
-
-
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'active_record'
 require 'makara'
 require 'timecop'
 require 'yaml'
+require 'rack'
 
 begin
   require 'byebug'
@@ -29,20 +30,12 @@ RSpec.configure do |config|
   config.include SpecHelpers
 
   config.before :each do
-    Makara::Cache.store = :memory
     change_context
     allow_any_instance_of(Makara::Strategies::RoundRobin).to receive(:should_shuffle?){ false }
     RSpec::Mocks.space.proxy_for(ActiveRecord::Base).reset # make sure not stubbed in some way
   end
 
   def change_context
-    Makara::Context.set_previous nil
-    Makara::Context.set_current nil
+    Makara::Context.set_current({})
   end
-
-  def roll_context
-    Makara::Context.set_previous Makara::Context.get_current
-    Makara::Context.set_current Makara::Context.generate
-  end
-
 end

data/spec/support/helpers.rb

@@ -15,9 +15,13 @@ module SpecHelpers
     slaves.times{ connections << {:role => 'slave'} }
     {
       :makara => {
-        :blacklist_duration => 30,
+        # Defaults:
+        # :master_ttl => 5,
+        # :blacklist_duration => 30,
+        # :sticky => true
+        :id => 'mock_mysql',
         :connections => connections
       }
     }
   end
-end
+end

data/spec/support/mock_objects.rb

@@ -11,7 +11,7 @@ class FakeConnection < Struct.new(:config)
   end
 
   def query(content)
-    []
+    config[:name]
   end
 
   def active?

data/spec/support/proxy_extensions.rb

@@ -1,6 +1,6 @@
 module ProxyExtensions
 
-  attr_reader :master_pool, :slave_pool, :master_context, :id
+  attr_reader :master_pool, :slave_pool, :id
   
   def master_for?(sql)
     pool_for(sql) == master_pool

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makara
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.0
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -61,11 +61,10 @@ files:
 - lib/active_record/connection_adapters/postgresql_makara_adapter.rb
 - lib/makara.rb
 - lib/makara/cache.rb
-- lib/makara/cache/memory_store.rb
-- lib/makara/cache/noop_store.rb
 - lib/makara/config_parser.rb
 - lib/makara/connection_wrapper.rb
 - lib/makara/context.rb
+- lib/makara/cookie.rb
 - lib/makara/error_handler.rb
 - lib/makara/errors/all_connections_blacklisted.rb
 - lib/makara/errors/blacklist_connection.rb
@@ -91,6 +90,7 @@ files:
 - spec/config_parser_spec.rb
 - spec/connection_wrapper_spec.rb
 - spec/context_spec.rb
+- spec/cookie_spec.rb
 - spec/middleware_spec.rb
 - spec/pool_spec.rb
 - spec/proxy_spec.rb
@@ -142,6 +142,7 @@ test_files:
 - spec/config_parser_spec.rb
 - spec/connection_wrapper_spec.rb
 - spec/context_spec.rb
+- spec/cookie_spec.rb
 - spec/middleware_spec.rb
 - spec/pool_spec.rb
 - spec/proxy_spec.rb

data/lib/makara/cache/memory_store.rb

@@ -1,31 +0,0 @@
-module Makara
-  module Cache
-    class MemoryStore
-
-      def initialize
-        @data = {}
-        @mutex = Mutex.new
-      end
-
-      def read(key)
-        clean
-        @data[key].try(:[], 0)
-      end
-
-      def write(key, value, options = {})
-        clean
-        @data[key] = [value, Time.now.to_i + (options[:expires_in] || 5).to_i]
-        true
-      end
-
-      protected
-
-      def clean
-        @mutex.synchronize do
-          @data.delete_if{|k,v| v[1] <= Time.now.to_i }
-        end
-      end
-
-    end
-  end
-end

data/lib/makara/cache/noop_store.rb

@@ -1,15 +0,0 @@
-module Makara
-  module Cache
-    class NoopStore
-
-      def read(key)
-        nil
-      end
-
-      def write(key, value, options = {})
-        nil
-      end
-
-    end
-  end
-end