marty 1.0.52 → 1.0.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e71e2648231c978b93c862ad779fa0df575f2d63
-  data.tar.gz: 2f4298094bc075059572563c6bd2b50b28592ed7
+  metadata.gz: e29a8f6100cbc30a7a8207778d67566180324348
+  data.tar.gz: 352aa2c3dfc43f0e59490f37219b8032669647b1
 SHA512:
-  metadata.gz: 6540246a26e8de445e57613206a53f15d755848e2a8e3fe0a0ddd2259a5d158fe9402174e87d91aa251313f1d6809102e55f750e4c44ac1b589dc7a427b12e6a
-  data.tar.gz: 1466a7f5b8d6f05c83efd822a6ed47ca0a4698e4ccaae5b68b1326c5cf28b5820120fb995b85a915aeff343fb92460e8ce41d0c452968c9c28b76345e6a756a8
+  metadata.gz: bf6c38998881fe010b0dc0231d2d12a572f84c7b69203caf573e5aafe986dd75815dd24ba26e70fd5a3c56645fa58d1ccfe12aa45339ca69b026778d3a42df97
+  data.tar.gz: 071174651bea3b1018210e959e963ef4dc9c5ccf7c7a36a3cb9e11cee5a9f8a3f08fc31e7d538fac33249570c5f28edaabff778bf97c0e86f29a0987698cbed0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (1.0.52)
+    marty (1.0.53)
       axlsx (= 2.1.0pre)
       coderay
       delorean_lang (~> 0.1)

data/app/controllers/marty/diagnostic_controller.rb

@@ -262,6 +262,70 @@ module Marty
       end
     end
 
+    class DelayedJob < Base
+      def self.delayed_job_count
+        db = ActiveRecord::Base.connection_config[:database]
+        get_pg_connections[db].count{|c| c['pid'] if
+          c['name'].include?('delayed_job')}
+      end
+
+      def self.pretty hash
+        hash.keys.map{|k| k + " => " + hash[k].to_s}.join("\n")
+      end
+
+      def self.verify_history delayed_versions
+        @@history ||= delayed_versions
+        @@history == delayed_versions
+      end
+
+      def self.validate data
+        data.each_with_object({}) do
+          |(k,v), h|
+          h[k] = v.count > 1 ? error("\n" + v.join("\n")) :
+                   v[0] != ENV['DELAYED_VER'] ? error(v[0]) : v[0]
+        end
+      end
+
+      def self.generate
+        count = delayed_job_count
+        return {'Status' => ['No delayed jobs are running.']} if count.zero?
+
+        # we will only iterate by half of the total delayed workers to avoid
+        # excess use of delayed job time
+        count = (count/2).zero? ? 1 : count/2
+
+        d_engine = Marty::ScriptSet.new.get_engine("Diagnostics")
+        res = d_engine.evaluate('VersionDelay', 'result', {'count' => count-1})
+
+        # merge results and remove duplicates
+        res.each_with_object({}){
+          |r, h|
+          h[r[0]] ||= []
+          h[r[0]] << r[1]
+        }.each_with_object({}){|(k,v), h| h[k] = v.uniq}
+      end
+
+      def self.aggregate
+        d_vers = validate(generate)
+
+        unless verify_history(d_vers)
+          a = @@history.to_a
+          b = d_vers.to_a
+          @@history = d_vers
+          d_vers += {"WARN" => error(["Result different from "\
+                                      "#{Marty::Helper.my_ip}'s history.",
+                                      "#{pretty(Hash[a - b])}"].join("\n"))}
+        end
+        package(d_vers)
+      end
+
+      def self.diff data
+        data = data[name.demodulize] if data[name.demodulize]
+        data.keys.map{|k| data[k]}.flatten.uniq.count != 1 ||
+          data[data.keys[0]] != ENV['DELAYED_VER']
+      end
+    end
+
     ############################################################################
     #
     # Reports

data/app/models/marty/helper.rb

@@ -0,0 +1,21 @@
+class Marty::Helper
+  include Delorean::Model
+
+  delorean_fn :sleep, sig: 1 do
+    |seconds|
+    Kernel.sleep seconds
+  end
+
+  delorean_fn :my_ip, sig:0 do
+    Socket.ip_address_list.detect{|intf| intf.ipv4_private?}.ip_address
+  end
+
+  delorean_fn :git, sig:0 do
+    [my_ip, ENV['DELAYED_VER']]
+  end
+
+  delorean_fn :range_step, sig: 3 do
+    |rstart, rend, step|
+    (rstart..rend).step(step).to_a
+  end
+end

data/delorean/diagnostics.dl

@@ -0,0 +1,12 @@
+Delay:
+    count  =?
+    # the delay parameter delays the next created job so that a different
+    # worker is more likely to claim it
+    delay  =? 2.6
+    ver    = Marty::Helper.sleep(delay) && Marty::Helper.git
+    res    = [(Delay() | "ver") for i in Marty::Helper.range_step(0, count, 1)]
+    result = [r.to_a for r in res]
+
+VersionDelay:
+    count =?
+    result = Delay(count=count) | "result"

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.52"
+  VERSION = "1.0.53"
 end

data/spec/controllers/diagnostic_controller_spec.rb

@@ -162,7 +162,7 @@ module Marty
         expected = nodes.each_with_object({}){|n, h| h[n] = version}
 
         # mock nodes and diag request to node
-        allow(described_class::Base.request).to receive(:port).and_return(nil)
+        allow(described_class::Base.request).to receive(:port).and_return(3000)
         allow(described_class::Base).to receive(:get_nodes).and_return(nodes)
         allow(described_class::Base).to receive_message_chain(uri_stub)
 

data/spec/dummy/config/initializers/delayed_job.rb

@@ -1,3 +1,5 @@
+ENV['DELAYED_VER'] = `cd #{Rails.root.to_s}; git describe --tags --always`.strip
+
 if Rails.env.test?
   # set a really small delay in test environment so that it doesn't
   # interfere as much with promise tests.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.52
+  version: 1.0.53
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -424,6 +424,7 @@ files:
 - app/models/marty/grid_index_integer.rb
 - app/models/marty/grid_index_numrange.rb
 - app/models/marty/grid_index_string.rb
+- app/models/marty/helper.rb
 - app/models/marty/import_type.rb
 - app/models/marty/log.rb
 - app/models/marty/name_validator.rb
@@ -483,6 +484,7 @@ files:
 - db/migrate/304_drop_marty_api_logs.rb
 - db/migrate/400_create_dg_plv8_v1_fns.rb
 - db/seeds.rb
+- delorean/diagnostics.dl
 - delorean/script_report.dl
 - gemini_deprecations.md
 - lib/marty.rb