zold 0.17.5 → 0.17.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c06af13af0d59a21c9855dc36c17c13cfe838286f7aadcb1ac3b130ed934d65d
-  data.tar.gz: 4349ebaee96c42a6224b92a4fc9a398f28d0f7c07352a34fd965d63bbf00b706
+  metadata.gz: c7a2934cd243231fd712085b3f87a94d6bb4bf614cc1f5a1e9cada9f7268939d
+  data.tar.gz: f92eb91031505dee84d3bdbbc072e3d7384494e4954a5420b7656b8089d425e7
 SHA512:
-  metadata.gz: 69b146cdf8bcc399e5213e1c8af4faa2aba937fd93a96ee845a0c9552ffbfe24fcb34d37c724298319aeddfde91ab2b30546f9afcb517232959000893ef40b4b
-  data.tar.gz: 82943553b346434e975041142b6ac21ffe301bae24695dc509613ef9b8fd8c0a625003f1b060360550b3eab1076f3cd42ad02a7f5de7b7d405f09534f36a3c10
+  metadata.gz: 7d974ce11c5bf502b56ce917c19ac1d388d3a28399ddcf84e0fc3860dd2935576965451f26750bcf52744c9b33f411a7e885d6c84cdcdcfbecc1699e008d7e5f
+  data.tar.gz: 7bb56302734385c3a20a824b0c9d312ed5d88b02adca2c6c0d9c68554e91d598f26ed29f2019e0435d4622308c5b0e889cade6737773ace52c62701b4fc2570c

data/lib/zold/commands/node.rb

@@ -159,7 +159,7 @@ module Zold
           default: false
         o.string '--alias',
           'The alias of the node (default: host:port)'
-        o.string '--no-spawn',
+        o.boolean '--no-spawn',
           'Don\'t use child processes for the score farm',
           default: false
         o.bool '--help', 'Print instructions'
@@ -259,8 +259,7 @@ module Zold
         network: opts['network']
       ).start do |entrance|
         Front.set(:entrance, entrance)
-        farmer = opts['no-spawn'] ? Farmers::Plain.new : Farmers::Fork.new(log: @log)
-        Farm.new(invoice, File.join(home, 'farm'), log: @log, farmer: farmer, strength: opts[:strength])
+        Farm.new(invoice, File.join(home, 'farm'), log: @log, farmer: farmer(opts), strength: opts[:strength])
           .start(host, opts[:port], threads: opts[:threads]) do |farm|
           Front.set(:farm, farm)
           metronome(farm, opts).start do |metronome|
@@ -276,6 +275,14 @@ module Zold
 
     private
 
+    def farmer(opts)
+      if opts['no-spawn']
+        @log.debug('Plain farmer is used, only one CPU will be utilized')
+        return Farmers::Plain.new
+      end
+      Farmers::Fork.new(log: @log)
+    end
+
     # Returns exit code
     def exec(cmd, nohup_log)
       start = Time.now

data/lib/zold/node/async_entrance.rb

@@ -28,6 +28,7 @@ require_relative '../size'
 require_relative '../id'
 require_relative '../endless'
 require_relative '../dir_items'
+require_relative 'soft_error'
 
 # The async entrance of the web front.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -49,7 +50,8 @@ module Zold
     def to_json
       @entrance.to_json.merge(
         'queue': @queue.size,
-        'threads': @threads.count
+        'threads': @threads.count,
+        'queue_limit': @queue_limit
       )
     end
 
@@ -80,7 +82,12 @@ module Zold
 
     # Always returns an array with a single ID of the pushed wallet
     def push(id, body)
-      raise "Queue is too long (#{@queue.size} wallets), try again later" if @queue.size > @queue_limit
+      if @queue.size > @queue_limit
+        raise(
+          SoftError,
+          "Queue is too long (#{@queue.size} wallets), can't add #{id}/#{Size.new(body.length)}, try again later"
+        )
+      end
       start = Time.now
       loop do
         uuid = SecureRandom.uuid

data/lib/zold/node/farm.rb

@@ -196,33 +196,28 @@ at #{host}:#{port}, strength is #{@strength}")
     def save(threads, list = [])
       scores = load + list
       period = @lifetime / [threads, 1].max
-      Futex.new(@cache).open do |f|
-        IO.write(
-          f,
-          scores.select(&:valid?)
-            .reject(&:expired?)
-            .reject { |s| s.strength < @strength }
-            .sort_by(&:value)
-            .reverse
-            .uniq(&:time)
-            .uniq { |s| (s.age / period).round }
-            .map(&:to_s)
-            .uniq
-            .join("\n")
-        )
-      end
+      body = scores.select(&:valid?)
+        .reject(&:expired?)
+        .reject { |s| s.strength < @strength }
+        .sort_by(&:value)
+        .reverse
+        .uniq(&:time)
+        .uniq { |s| (s.age / period).round }
+        .map(&:to_s)
+        .uniq
+        .join("\n")
+      Futex.new(@cache).open { |f| IO.write(f, body) }
     end
 
     def load
       return [] unless File.exist?(@cache)
-      Futex.new(@cache).open(false) do |f|
-        IO.read(f).split(/\n/).map do |t|
-          Score.parse(t)
-        rescue StandardError => e
-          @log.error(Backtrace.new(e).to_s)
-          nil
-        end.compact
-      end
+      body = Futex.new(@cache).open(false) { |f| IO.read(f) }
+      body.split(/\n/).reject(&:empty?).map do |t|
+        Score.parse(t)
+      rescue StandardError => e
+        @log.error(Backtrace.new(e).to_s)
+        nil
+      end.compact
     end
   end
 end

data/lib/zold/node/farmers.rb

@@ -61,15 +61,17 @@ module Zold
 
       def up(score)
         start = Time.now
-        stdin, stdout = IO.pipe
+        stdout, stdin = IO.pipe
         pid = Process.fork do
-          stdout.puts(score.next)
+          stdin.puts(score.next)
         end
         at_exit { Farmers.kill(@log, pid, start) }
         Process.wait
-        stdout.close
-        after = Score.parse(stdin.read.strip)
         stdin.close
+        text = stdout.read.strip
+        stdout.close
+        raise "No score was calculated in the process ##{pid} in #{Age.new(start)}" if text.empty?
+        after = Score.parse(text)
         @log.debug("Next score #{after.value}/#{after.strength} found in proc ##{pid} \
 for #{after.host}:#{after.port} in #{Age.new(start)}: #{after.suffixes}")
         after

data/lib/zold/node/front.rb

@@ -38,6 +38,7 @@ require_relative '../log'
 require_relative '../tax'
 require_relative '../id'
 require_relative '../http'
+require_relative 'soft_error'
 
 # The web front of the node.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -46,6 +47,10 @@ require_relative '../http'
 module Zold
   # Web front
   class Front < Sinatra::Base
+    # The minimum score required in order to recongnize a requestor
+    # as a valuable node and add it to the list of remotes.
+    MIN_SCORE = 16
+
     configure do
       Thread.current.name = 'sinatra'
       set :bind, '0.0.0.0'
@@ -76,6 +81,7 @@ module Zold
     use Rack::Deflater
 
     before do
+      Thread.current.name = "#{request.request_method}:#{request.url}"
       Thread.current.thread_variable_set(:uri, request.url)
       Thread.current.thread_variable_set(:ip, request.ip)
       @start = Time.now
@@ -101,6 +107,7 @@ while #{settings.address} is in '#{settings.opts['network']}'")
           s = Score.parse_text(header)
           error(400, 'The score is invalid') unless s.valid?
           error(400, 'The score is weak') if s.strength < Score::STRENGTH && !settings.opts['ignore-score-weakness']
+          return if s.value < Front::MIN_SCORE && !settings.opts['ignore-score-weakness']
           if settings.address == "#{s.host}:#{s.port}" && !settings.opts['ignore-score-weakness']
             error(400, 'Self-requests are prohibited')
           end
@@ -120,10 +127,11 @@ while #{settings.address} is in '#{settings.opts['network']}'")
     #  Currently there are no tests at all that would verify the headers.
     after do
       headers['Cache-Control'] = 'no-cache'
+      headers['X-Zold-Path'] = request.url
       headers['X-Zold-Version'] = settings.opts['expose-version']
       headers[Http::PROTOCOL_HEADER] = settings.protocol.to_s
       headers['Access-Control-Allow-Origin'] = '*'
-      headers[Http::SCORE_HEADER] = score.reduced(16).to_s
+      headers[Http::SCORE_HEADER] = score.reduced(Front::MIN_SCORE).to_s
       headers['X-Zold-Thread'] = Thread.current.object_id.to_s
       unless @start.nil?
         if Time.now - @start > 1
@@ -199,7 +207,7 @@ in #{Age.new(@start, limit: 1)}")
           require 'get_process_mem'
           mem = GetProcessMem.new.bytes.to_i
           if mem > 256 * 1024 * 1024 && !settings.opts['skip-oom']
-            settings.log.error('We are too big in memory, quitting; use --skip-oom to never quit')
+            settings.log.error("We are too big in memory (#{Size.new(mem)}), quitting; use --skip-oom to never quit")
             Front.stop!
           end
           mem
@@ -420,8 +428,7 @@ in #{Age.new(@start, limit: 1)}")
       e = env['sinatra.error']
       content_type 'text/plain'
       headers['X-Zold-Error'] = e.message
-      headers['X-Zold-Path'] = request.url
-      settings.log.error(Backtrace.new(e).to_s)
+      settings.log.error(Backtrace.new(e).to_s) unless e.is_a?(SoftError)
       Backtrace.new(e).to_s
     end
 

data/lib/zold/node/soft_error.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# Soft error.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Soft error
+  module SoftError
+    # Nothing special
+  end
+end

data/lib/zold/remotes.rb

@@ -104,20 +104,21 @@ module Zold
 
       def assert_valid_score(score)
         raise "Invalid score #{score}" unless score.valid?
-        raise "Expired score (#{Age.new(score.time)}) #{score}" if score.expired?
+        raise "Expired score (#{Age.new(score.time)}) #{score.reduce(4)}" if score.expired?
       end
 
       def assert_score_ownership(score)
-        raise "Masqueraded host #{@host} as #{score.host}: #{score}" if @host != score.host
-        raise "Masqueraded port #{@port} as #{score.port}: #{score}" if @port != score.port
+        raise "Masqueraded host #{@host} as #{score.host}: #{score.reduce(4)}" if @host != score.host
+        raise "Masqueraded port #{@port} as #{score.port}: #{score.reduce(4)}" if @port != score.port
       end
 
       def assert_score_strength(score)
-        raise "Score #{score.strength} is too weak (<#{Score::STRENGTH}): #{score}" if score.strength < Score::STRENGTH
+        return if score.strength >= Score::STRENGTH
+        raise "Score #{score.strength} is too weak (<#{Score::STRENGTH}): #{score.reduce(4)}"
       end
 
       def assert_score_value(score, min)
-        raise "Score #{score.value} is too small (<#{min}): #{score}" if score.value < min
+        raise "Score #{score.value} is too small (<#{min}): #{score.reduce(4)}" if score.value < min
       end
     end
 

data/lib/zold/version.rb

@@ -25,6 +25,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.17.5'
+  VERSION = '0.17.6'
   PROTOCOL = 2
 end

data/test/node/test_front.rb

@@ -266,7 +266,7 @@ class FrontTest < Zold::Test
 
   def test_performance
     times = Queue.new
-    FakeNode.new(log: test_log).run(['--threads=4', '--strength=6', '--no-metronome', '--farmer=ruby-proc']) do |port|
+    FakeNode.new(log: test_log).run(['--threads=4', '--strength=6', '--no-metronome']) do |port|
       Threads.new(10).assert(100) do
         start = Time.now
         Zold::Http.new(uri: URI("http://localhost:#{port}/")).get
@@ -278,6 +278,21 @@ class FrontTest < Zold::Test
     test_log.info("Average response time is #{all.inject(&:+) / all.count}")
   end
 
+  # The score exposed via the HTTP header must be reduced to the value of 16.
+  # We need this in order to optimize the amount of data we transfer in each
+  # HTTP request. This value is enough to identify a valueable node, and filter
+  # out those that are too weak.
+  def test_score_is_reduced
+    FakeNode.new(log: test_log).run(['--threads=1', '--strength=1', '--no-metronome', '--no-spawn']) do |port|
+      res = Zold::Http.new(uri: URI("http://localhost:#{port}/")).get
+      assert_wait { Zold::Score.parse(res.headers[Zold::Http::SCORE_HEADER]).value > Zold::Front::MIN_SCORE - 1 }
+      sleep(1)
+      assert_equal_wait(Zold::Front::MIN_SCORE) do
+        Zold::Score.parse(res.headers[Zold::Http::SCORE_HEADER]).value
+      end
+    end
+  end
+
   def test_headers_are_being_set_correctly
     Time.stub :now, Time.at(0) do
       FakeNode.new(log: test_log).run(['--expose-version=9.9.9', '--no-metronome', '--threads=0']) do |port|

data/zold.gemspec

@@ -65,7 +65,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'concurrent-ruby', '1.1.3'
   s.add_runtime_dependency 'cucumber', '3.1.2' # has to stay here for Heroku
   s.add_runtime_dependency 'diffy', '3.2.1'
-  s.add_runtime_dependency 'futex', '0.4.3'
+  s.add_runtime_dependency 'futex', '0.6.1'
   s.add_runtime_dependency 'get_process_mem', '0.2.3'
   s.add_runtime_dependency 'json', '2.1.0'
   s.add_runtime_dependency 'memory_profiler', '0.9.12'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.17.5
+  version: 0.17.6
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-01 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: get_process_mem
   requirement: !ruby/object:Gem::Requirement
@@ -603,6 +603,7 @@ files:
 - lib/zold/node/nodup_entrance.rb
 - lib/zold/node/nospam_entrance.rb
 - lib/zold/node/safe_entrance.rb
+- lib/zold/node/soft_error.rb
 - lib/zold/node/spread_entrance.rb
 - lib/zold/node/sync_entrance.rb
 - lib/zold/node/trace.rb
@@ -699,7 +700,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.17.5!
+  Thanks for installing Zold 0.17.6!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try online wallet at: https://wts.zold.io