marty 1.0.24 → 1.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86b79d602a84a7fea3fbca2b3704a8f9ccf6b00b
-  data.tar.gz: 0720c7fe854939427a378e0cca9cfc8ebf96302f
+  metadata.gz: 5118b11e2b94fade41047bae2dec32b1a3bcd15a
+  data.tar.gz: c022e1c2d19cdb84ca5403fc7898ebfeececaa88
 SHA512:
-  metadata.gz: b4d7f133d884839c72815a068934c54b26f7c366850fda2c313cd600a277eb93d2f438d5ad932fa5b66a9f0b9b25d7177465e209bdd1e8127d0309e4bc37fed7
-  data.tar.gz: 429013d616affaa52db3d1eaffe52bc6402fd5e70245fb61f7de855debe7cbc68cd6214cb3e2c29dee96e535f80cc0da5e996c7a8ecc37c37df90e4dda5a873d
+  metadata.gz: 51e55d9a99ddce93de589b4873005c337b7ad8343659d1b8771b65a2146b2da68fc5757668eb05a420b06d45f866c61f635932e57f7ca4f06e798d08d5154f98
+  data.tar.gz: d097e901de04b56b8b073fb3e9459c952e7108f54261869c1e6501a56b4c473ef32793f4eae4deccf485f44ff92fcab6da79961af1737e8b69cf37a292da1029

data/app/models/marty/log.rb

@@ -36,7 +36,20 @@ class Marty::Log < Marty::Base
       stmt.bind_param(3, Time.zone.now.to_f)
       stmt.bind_param(4, details.pretty_inspect)
 
-      stmt.execute
+      sent = false
+      retries = 3
+      delay = 0.1
+      until sent
+        begin
+          stmt.execute
+          sent = true
+        rescue SQLite3::BusyException
+          raise if retries == 0
+          retries -= 1
+          sleep delay
+        end
+      end
+
     rescue => e
       Marty::Util.logger.error("Marty::Logger failure: #{e.message}")
     ensure

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.24"
+  VERSION = "1.0.25"
 end

data/spec/dummy/app/models/gemini/helper.rb

@@ -41,4 +41,18 @@ class Gemini::Helper
     |pt|
     Mcfly.is_infinity pt
   end
+
+  delorean_fn :testlog, sig: 2 do
+    |str, data|
+    10.times { Marty::Logger.info(str, data) }
+    true
+  end
+  delorean_fn :testaction, sig: 2 do
+    |str, id|
+    File.open("/tmp/logaction.txt", "a") do |f|
+      f.puts str % [id]
+    end
+  end
+
+
 end

data/spec/job_helper.rb

@@ -102,6 +102,16 @@ FAILER:
     a = ERR('I had an error')
 EOS
 
+NAME_K = "PromiseK"
+SCRIPT_K = <<EOS
+LOGGER:
+    msgid =? nil
+
+    result = Gemini::Helper.testlog('message', [msgid]) &&
+             Gemini::Helper.testaction('message %d', msgid)
+
+EOS
+
 def promise_bodies
   {
     NAME_A => SCRIPT_A,
@@ -114,5 +124,6 @@ def promise_bodies
     NAME_H => SCRIPT_H,
     NAME_I => SCRIPT_I,
     NAME_J => SCRIPT_J,
+    NAME_K => SCRIPT_K,
   }
 end

data/spec/lib/logger_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'job_helper'
 
 module Marty
   describe Logger do
@@ -97,4 +98,58 @@ module Marty
       end
     end
   end
+  describe "Exercise" do
+    before(:all) do
+      @clean_file = "/tmp/clean_#{Process.pid}.psql"
+      save_clean_db(@clean_file)
+      # transactional fixtures interfere with queueing jobs
+      self.use_transactional_fixtures = false
+
+      # Needed here because shutting transactional fixtures off
+      # means we lose the globally set user
+      Mcfly.whodunnit = UserHelpers.system_user
+
+      Marty::Script.load_script_bodies(promise_bodies, Date.today)
+      start_delayed_job
+    end
+    after(:all) do
+      restore_clean_db(@clean_file)
+      stop_delayed_job
+      File.unlink("/tmp/logaction.txt")
+      Marty::Log.cleanup(0)
+      self.use_transactional_fixtures = true
+    end
+
+    it "handles heavy load" do
+      File.open(Rails.root.join("log/test.log")) do |f|
+        f.seek(0, IO::SEEK_END)
+        engine = Marty::ScriptSet.new.get_engine(NAME_K)
+        (1..1000).each do |i|
+          engine.background_eval("LOGGER", {"msgid" => i}, ["result"])
+        end
+
+        60.times do
+          running = Marty::Promise.uncached {
+            Marty::Promise.unscoped.where(result: nil)
+          }.count
+          break if running == 0
+          sleep 1
+        end
+
+        # each background_eval writes one line to /tmp/logaction.txt
+        # these must happen no matter what happens in Marty::Logger
+        expect(File.readlines("/tmp/logaction.txt").count).to eq(1000)
+
+        # each background_eval does 10 calls to Marty::Logger.
+        # failures (after 3 retries at 0.1 sec each) are logged to rails log
+        # the total count should be 10000
+        log_count = Marty::Log.all.count
+        failed_count = f.readlines.select do
+          |l|
+          l == "Marty::Logger failure: database is locked\n"
+        end.count
+        expect(log_count + failed_count).to eq(10000)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.24
+  version: 1.0.25
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg