prefab-cloud-ruby 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f4b5d7fb7e15da13eaf3e2fb5891b4aa89604db
-  data.tar.gz: '0779901b0789060861efafd813b28c06e1107ed4'
+  metadata.gz: 2d4da69f7090effaacca738be0a70baec8e2c8d0
+  data.tar.gz: 42b6de32dbefaa8f23ef024a4b7b8250d78d2c48
 SHA512:
-  metadata.gz: '09d6907355402ffaddc9e757ac159e0172c5a227aa24793aa583326291f3590fa100f59b0bec36e4fca3605c054f47defd7da466c5244c209b28d0392a7c6283'
-  data.tar.gz: 7b3e1ce5ca388374a065fae0106abf52d155cbbfd1e61967ae38d28cb88cee5763226fa88c4c9fc4b60c99d212b1e69908f0c245d1131b142ec9beef9a6bd05d
+  metadata.gz: 70ef17720139c952bdfdfa3938578c69365554155f20687bee068e5d3715b811394932e548b31673529448321b76f6c8892eec21dcaacd41fc4031ab63f9fb66
+  data.tar.gz: 85fddf3468abde394bada8b5404935e213bd52f193f0cc6e0abb04d34c5c6ad8b55c4fb83ab83d3234663f649354158aca1fb4c14a897dfb1477ad43e2926204

data/VERSION

@@ -1 +1 @@
-0.0.18
+0.0.19

data/lib/prefab/client.rb

@@ -80,11 +80,15 @@ module Prefab
       end
     end
 
+    def cache_key(post_fix)
+      "prefab:#{account_id}:#{post_fix}"
+    end
+
     private
 
     def reset!
       @stubs.clear
-      reset_channel!
+      @_channel = nil
     end
 
     def stub_for(service, timeout)

data/lib/prefab/config_client.rb

@@ -1,17 +1,16 @@
 module Prefab
   class ConfigClient
     RECONNECT_WAIT = 5
-    CHECKPOINT_LOCK = 20
+    SUSPENDERS_RESET_LOCK_SEC = 20
     DEFAULT_CHECKPOINT_FREQ_SEC = 10
-    DEFAULT_MAX_CHECKPOINT_AGE_SEC = 60
+    DEFAULT_MAX_SUSPENDERS_AGE_SEC = 60
 
     def initialize(base_client, timeout)
       @base_client = base_client
       @timeout = timeout
       @initialization_lock = Concurrent::ReadWriteLock.new
 
-      @checkpoint_max_age_secs = (ENV["PREFAB_CHECKPOINT_MAX_AGE_SEC"] || DEFAULT_MAX_CHECKPOINT_AGE_SEC)
-      @checkpoint_max_age = @checkpoint_max_age_secs * 1000 * 10000
+      @suspenders_max_age_secs = (ENV["PREFAB_SUSPENDERS_MAX_AGE_SEC"] || DEFAULT_MAX_SUSPENDERS_AGE_SEC)
       @checkpoint_freq_secs = (ENV["PREFAB_DEFAULT_CHECKPOINT_FREQ_SEC"] || DEFAULT_CHECKPOINT_FREQ_SEC)
 
       @config_loader = Prefab::ConfigLoader.new(@base_client)
@@ -19,7 +18,9 @@ module Prefab
 
       @initialization_lock.acquire_write_lock
 
-      start_checkpointing_thread
+      load_or_save_checkpoint
+      ensure_api_connection_started
+      start_checkpointing_thread if has_real_cache?
     end
 
     def get(prop)
@@ -29,14 +30,14 @@ module Prefab
     end
 
     def upsert(key, config_value, namespace = nil, previous_key = nil)
-      raise "key must not contain ':' set namespaces separately" if key.include? ":"
-      raise "namespace must not contain ':'" if namespace&.include?(":")
+      raise "Key must not contain ':' set namespaces separately" if key.include? ":"
+      raise "Namespace must not contain ':'" if namespace&.include?(":")
       config_delta = Prefab::ConfigClient.value_to_delta(key, config_value, namespace)
       upsert_req = Prefab::UpsertRequest.new(config_delta: config_delta)
       upsert_req.previous_key = previous_key if previous_key&.present?
 
       @base_client.request Prefab::ConfigService, :upsert, req_options: { timeout: @timeout }, params: upsert_req
-
+      @base_client.stats.increment("prefab.config.upsert")
       @config_loader.set(config_delta)
       @config_loader.rm(previous_key) if previous_key&.present?
       @config_resolver.update
@@ -76,6 +77,7 @@ module Prefab
           @config_loader.set(delta)
         end
         @base_client.log_internal Logger::INFO, "Found checkpoint with highwater id #{@config_loader.highwater_mark}"
+        @base_client.stats.increment("prefab.config.checkpoint.load")
         @config_resolver.update
         finish_init!
       else
@@ -91,6 +93,7 @@ module Prefab
         @base_client.log_internal Logger::DEBUG, "Save Checkpoint #{@config_loader.highwater_mark} Thread #{Thread.current.object_id}"
         @base_client.shared_cache.write(checkpoint_cache_key, Prefab::ConfigDeltas.encode(deltas))
         @base_client.shared_cache.write(checkpoint_highwater_cache_key, @config_loader.highwater_mark)
+        @base_client.stats.increment("prefab.config.checkpoint.save")
       rescue StandardError => exn
         @base_client.log_internal Logger::INFO, "Issue Saving Checkpoint #{exn.message}"
       end
@@ -101,7 +104,9 @@ module Prefab
       Thread.new do
         loop do
           begin
-            checkpoint_if_needed
+            load_or_save_checkpoint
+
+            suspenders_if_needed
 
             started_at = Time.now
             delta = @checkpoint_freq_secs - (Time.now - started_at)
@@ -120,9 +125,9 @@ module Prefab
     # if it is lower than our own highwater mark, save a checkpoint
     # if everything is up to date, but the shared highwater mark is old, coordinate amongst other processes to have
     #    one process "double check" by restarting the API thread
-    def checkpoint_if_needed
+    def load_or_save_checkpoint
       shared_highwater_mark = get_shared_highwater_mark
-      @base_client.log_internal Logger::DEBUG, "Checkpoint_if_needed apx ahead/behind #{(@config_loader.highwater_mark - shared_highwater_mark) / (1000 * 10000)}"
+      @base_client.log_internal Logger::DEBUG, "Checkpoint_if_needed highwater apx ahead/behind #{(@config_loader.highwater_mark - shared_highwater_mark) / (1000 * 10000)}"
 
       if shared_highwater_mark > @config_loader.highwater_mark
         @base_client.log_internal Logger::DEBUG, "We were behind, loading checkpoint"
@@ -130,40 +135,52 @@ module Prefab
       elsif shared_highwater_mark < @config_loader.highwater_mark
         @base_client.log_internal Logger::DEBUG, "Saving off checkpoint"
         save_checkpoint
-      elsif shared_highwater_is_old?
+      end
+    end
+
+    def suspenders_if_needed
+      if suspenders_age_is_old?
         if get_shared_lock?
-          @base_client.log_internal Logger::DEBUG, "Shared highwater mark > PREFAB_CHECKPOINT_MAX_AGE #{@checkpoint_max_age_secs}. We have been chosen to run suspenders"
+          @base_client.log_internal Logger::DEBUG, "Suspenders > PREFAB_SUSPENDERS_MAX_AGE_SEC #{@suspenders_max_age_secs}. We have been chosen to run suspenders"
           reset_api_connection
         else
-          @base_client.log_internal Logger::DEBUG, "Shared highwater mark > PREFAB_CHECKPOINT_MAX_AGE #{@checkpoint_max_age_secs}. Other process is running suspenders"
+          @base_client.log_internal Logger::DEBUG, "Suspenders > PREFAB_SUSPENDERS_MAX_AGE_SEC #{@suspenders_max_age_secs}. Other process is running suspenders"
         end
       end
     end
 
-    def current_time_as_id
-      Time.now.to_f * 1000 * 10000
-    end
-
-    def shared_highwater_is_old?
-      age = current_time_as_id - get_shared_highwater_mark
-      @base_client.log_internal Logger::DEBUG, "shared_highwater_is_old? apx #{age / (1000 * 10000)}" if age > @checkpoint_max_age
-      age > @checkpoint_max_age_secs
+    def suspenders_age_is_old?
+      age = Time.now.to_i - get_checkpoint_suspenders
+      @base_client.log_internal Logger::DEBUG, "checkpoint_suspenders_is_old? apx #{age}" if age > @suspenders_max_age_secs
+      age > @suspenders_max_age_secs
     end
 
     def get_shared_highwater_mark
       (@base_client.shared_cache.read(checkpoint_highwater_cache_key) || 0).to_i
     end
 
+    def get_checkpoint_suspenders
+      (@base_client.shared_cache.read(suspenders_last_run_cache_key) || 0).to_i
+    end
+
+    def set_suspenders
+      @base_client.shared_cache.write(suspenders_last_run_cache_key, Time.now.to_i)
+    end
+
     def get_shared_lock?
-      in_progess = @base_client.shared_cache.read(checkpoint_update_in_progress_cache_key)
+      in_progess = @base_client.shared_cache.read(suspenders_reset_in_progress_cache_key)
       if in_progess.nil?
-        @base_client.shared_cache.write(checkpoint_update_in_progress_cache_key, "true", { expires_in: CHECKPOINT_LOCK })
+        @base_client.shared_cache.write(suspenders_reset_in_progress_cache_key, "true", { expires_in: SUSPENDERS_RESET_LOCK_SEC })
         true
       else
         false
       end
     end
 
+    def ensure_api_connection_started
+      reset_api_connection if @api_connection_thread.nil?
+    end
+
     def reset_api_connection
       @api_connection_thread&.exit
       start_api_connection_thread(@config_loader.highwater_mark)
@@ -182,6 +199,8 @@ module Prefab
       config_req = Prefab::ConfigServicePointer.new(account_id: @base_client.account_id,
                                                     start_at_id: start_at_id)
       @base_client.log_internal Logger::DEBUG, "start api connection thread #{start_at_id}"
+      @base_client.stats.increment("prefab.config.api.start")
+      set_suspenders
       @api_connection_thread = Thread.new do
         while true do
           begin
@@ -202,16 +221,24 @@ module Prefab
       end
     end
 
+    def has_real_cache?
+      @base_client.shared_cache.class != NoopCache
+    end
+
     def checkpoint_cache_key
-      "prefab:config:checkpoint"
+      @base_client.cache_key "config:checkpoint"
     end
 
-    def checkpoint_update_in_progress_cache_key
-      "prefab:config:checkpoint:updating"
+    def suspenders_reset_in_progress_cache_key
+      @base_client.cache_key "config:checkpoint:updating"
     end
 
     def checkpoint_highwater_cache_key
-      "prefab:config:checkpoint:highwater"
+      @base_client.cache_key "config:checkpoint:highwater"
+    end
+
+    def suspenders_last_run_cache_key
+      @base_client.cache_key "config:checkpoint:suspenders"
     end
   end
 end

data/lib/prefab/config_loader.rb

@@ -21,6 +21,11 @@ module Prefab
     end
 
     def set(delta)
+      # don't overwrite newer values
+      if @api_config[delta.key] && @api_config[delta.key].id > delta.id
+        return
+      end
+
       if delta.value.nil?
         @api_config.delete(delta.key)
       else

data/lib/prefab/noop_stats.rb

@@ -2,7 +2,7 @@ module Prefab
 
   class NoopStats
     # receives increment("prefab.ratelimit.limitcheck", {:tags=>["policy_group:page_view", "pass:true"]})
-    def increment(name, opts)
+    def increment(name, opts={})
     end
   end
 end

data/lib/prefab/ratelimit_client.rb

@@ -39,7 +39,7 @@ module Prefab
       handle_error(e, on_error, groups)
     end
 
-    def upsert(group, policy_name, limit, burst: nil)
+    def upsert(group, policy_name, limit, burst: nil, safety_level: nil)
       burst = limit if burst.nil?
       limit_defintion = Prefab::LimitDefinition.new(
         account_id: @base_client.account_id,
@@ -48,6 +48,10 @@ module Prefab
         limit: limit,
         burst: burst
       )
+      unless safety_level.nil?
+        limit_defintion.safety_level = safety_level
+      end
+
       @base_client.request Prefab::RateLimitService, :upsert_limit_definition, params: limit_defintion
     end
 

data/prefab-cloud-ruby.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: prefab-cloud-ruby 0.0.18 ruby lib
+# stub: prefab-cloud-ruby 0.0.19 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.0.18"
+  s.version = "0.0.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jeff Dwyer".freeze]
-  s.date = "2018-03-12"
+  s.date = "2018-04-09"
   s.description = "RateLimits & Config as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.extra_rdoc_files = [

data/test/test_config_loader.rb

@@ -25,6 +25,23 @@ class TestConfigLoader < Minitest::Test
     assert_equal 5, @loader.highwater_mark
   end
 
+
+
+  def test_keeps_most_recent
+    assert_equal 0, @loader.highwater_mark
+    @loader.set(Prefab::ConfigDelta.new(id: 1, key: "sample_int", value: Prefab::ConfigValue.new(int: 1)))
+    assert_equal 1, @loader.highwater_mark
+    should_be :int, 1, "sample_int"
+
+    @loader.set(Prefab::ConfigDelta.new(id: 4, key: "sample_int", value: Prefab::ConfigValue.new(int: 4)))
+    assert_equal 4, @loader.highwater_mark
+    should_be :int, 4, "sample_int"
+
+    @loader.set(Prefab::ConfigDelta.new(id: 2, key: "sample_int", value: Prefab::ConfigValue.new(int: 2)))
+    assert_equal 4, @loader.highwater_mark
+    should_be :int, 4, "sample_int"
+  end
+
   def test_api_precedence
     should_be :int, 123, "sample_int"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc