zold 0.14.17 → 0.14.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8582f56181daabcedc46abc203d1943bfda757ce
-  data.tar.gz: e90c0622d71c5982bc1b17d77ee715aa6945bf52
+  metadata.gz: 5ecca17ec572da83d30874c74ad40b383e22855e
+  data.tar.gz: 501cc2ef09710e3bd6d578d3f8cae99895ae25e8
 SHA512:
-  metadata.gz: 34d9806bfa3b4432ceed5edec33133e0488299c9f7265bdac939aa4676f1ed7a15107487f39da8400545fe5974f23ad8cc84a77f6ff70059b1e3d1250eef117a
-  data.tar.gz: e56681d98fd04e4b2e9eb105036b853a871f1fe0e9d214e91d4db22078bb78f1d0f3e7197313c6162e7c3e93a2c8dbe948dc4a5c7edd1f1d72343df3fa8a9ae2
+  metadata.gz: 584cfab45f2f97b6d5bccaee7e285d1637ca546357bb9b08e7a7e30f85789a31ca69e59ec96e72177b6c64568284e0ab982248bc25c0ada8a13ad86580c9496b
+  data.tar.gz: '09553f0034eee231dbba5c6d1eccd3c2d4e8e120bb70505f741d1b20f21cd7d103baeca54259c0e5bfad66b97e4b64b62ea3fb536b5eef411b9344faf83fbbfa'

data/.gitignore

@@ -5,3 +5,5 @@ Gemfile.lock
 .bundle/
 .DS_Store
 rdoc/
+.zoldata
+farm

data/.rubocop.yml

@@ -16,7 +16,7 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 100
 Metrics/ClassLength:
-  Max: 250
+  Max: 300
 Layout/EndOfLine:
   EnforcedStyle: lf
 Metrics/ParameterLists:

data/bin/zold

@@ -95,6 +95,8 @@ Available commands:
       Run node at the given TCP port
     #{Rainbow('alias').green} [alias] [wallet ID]
       Set an alias for a wallet
+    #{Rainbow('next').green} score
+      Generate next score from the provided one
     #{Rainbow('score').green} [options]
       Generate score for the given host and port
 Available options:"
@@ -149,7 +151,7 @@ Available options:"
   Zold::RenameForeignWallets.new(Dir.pwd, opts['network'], log).exec
 
   wallets = Zold::Wallets.new('.')
-  remotes = Zold::Remotes.new('./.zoldata/remotes', network: opts['network'])
+  remotes = Zold::Remotes.new(file: './.zoldata/remotes', network: opts['network'])
   copies = './.zoldata/copies'
 
   case command
@@ -201,6 +203,9 @@ Available options:"
   when 'score'
     require_relative '../lib/zold/commands/calculate'
     Zold::Calculate.new(log: log).run(args)
+  when 'next'
+    require_relative '../lib/zold/commands/next'
+    Zold::Next.new(log: log).run(args)
   else
     raise "Command '#{command}' is not supported"
   end

data/fixtures/scripts/_head.sh

@@ -5,7 +5,7 @@ shopt -s expand_aliases
 
 export RUBYOPT="-W0"
 
-alias zold="$1 --ignore-this-stupid-option --ignore-global-config --trace --network=test --no-colors"
+alias zold="$1 --ignore-this-stupid-option --halt-code=test --ignore-global-config --trace --network=test --no-colors --dump-errors"
 
 function reserve_port {
   python -c 'import socket; s=socket.socket(); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'
@@ -13,33 +13,53 @@ function reserve_port {
 
 function wait_for_url {
   while ! curl --silent --fail $1 > /dev/null; do
-    ((p++)) || sleep 1
+    ((p++)) || sleep 5
     if ((p==30)); then
-      echo URL $1 is not available after $p seconds of waiting
-      exit -1
+      echo "URL $1 is not available after $p seconds of waiting"
+      exit 12
     fi
-    sleep 1
+    sleep 5
   done
 }
 
 function wait_for_port {
   while ! nc -z localhost $1; do
-    ((p++)) || sleep 1
+    ((p++)) || sleep 5
     if ((p==30)); then
-      echo Port $1 is not available after $p seconds of waiting
-      exit -1
+      echo "Port $1 is not available after $p seconds of waiting"
+      exit 13
     fi
-    sleep 1
+    sleep 5
   done
 }
 
 function wait_for_file {
   while [ ! -f $1 ]; do
-    ((c++)) || sleep 1
+    ((c++)) || sleep 5
     if ((c==30)); then
-      echo File $1 not found, giving up after $c seconds of waiting
-      exit -1
+      echo "File $1 not found, giving up after $c seconds of waiting"
+      exit 14
     fi
-    sleep 1
+    sleep 5
   done
 }
+
+function halt_nodes {
+  for p in "$@"; do
+    pid=$(curl --silent "http://localhost:$p/pid?halt=test" || echo 'absent')
+    if [[ "${pid}" =~ ^[0-9]+$ ]]; then
+      while kill -0 ${pid}; do
+        ((c++)) || sleep 5
+        if ((c==30)); then
+          echo "Waiting for process ${pid} to die"
+          exit 15
+        fi
+        echo "Still waiting for process ${pid} to die, cycle no.${c}"
+        sleep 5
+      done
+      echo "Process ${pid} is dead!"
+    fi
+    echo "Node at TCP port ${p} stopped!"
+  done
+}
+

data/fixtures/scripts/calculate-scores.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-zold score --host=zold.io --port=4096 --invoice=NOSUFFIX@ffffffffffffffff --strength=2 --max=5
+zold score --host=zold.io --port=4096 --invoice=CALCSCORE@ffffffffffffffff --strength=2 --max=5

data/fixtures/scripts/distribute-wallet.sh

@@ -4,7 +4,7 @@ function start_node {
   port=$(reserve_port)
   mkdir ${port}
   cd ${port}
-  zold node --trace --invoice=NOPREFIX@ffffffffffffffff \
+  zold node --trace --invoice=DISTRWALLET@ffffffffffffffff \
     --host=localhost --port=${port} --bind-port=${port} \
     --threads=0 --routine-immediately > log.txt &
   pid=$!
@@ -18,7 +18,7 @@ function start_node {
 # don't do the TRAP for killing, the test will never end.
 first=$(start_node)
 second=$(start_node)
-trap "kill -9 $(cat ${first}/pid) $(cat ${second}/pid)" EXIT
+trap "halt_nodes ${first} ${second}" EXIT
 
 # The first node is linked to the second one and the second one
 # is linked to the first one. The --home argument specifies their

data/fixtures/scripts/push-and-pull.sh

@@ -4,11 +4,11 @@ port=$(reserve_port)
 
 mkdir server
 cd server
-zold node --trace --invoice=NOPREFIX@ffffffffffffffff \
+zold node --trace --invoice=PUSHNPULL@ffffffffffffffff \
   --host=localhost --port=${port} --bind-port=${port} \
   --threads=0 --standalone &
 pid=$!
-trap "kill -9 $pid" EXIT
+trap "halt_nodes ${port}" EXIT
 cd ..
 
 wait_for_port ${port}

data/fixtures/scripts/redeploy-on-upgrade.sh

@@ -4,9 +4,9 @@ function start_node {
   mkdir $1
   cd $1
   zold remote clean
-  zold node $3 --nohup --nohup-command='touch restarted' --nohup-log=log \
+  zold node $3 --nohup --nohup-command='touch restarted' --nohup-log=log --nohup-max-cycles=0 \
     --expose-version=$2 --save-pid=pid --routine-immediately \
-    --verbose --trace --invoice=NOPREFIX@ffffffffffffffff \
+    --verbose --trace --invoice=REDEPLOY@ffffffffffffffff \
     --host=localhost --port=$1 --bind-port=$1 --threads=0 > /dev/null 2>&1
   wait_for_port $1
   cat pid
@@ -20,7 +20,7 @@ low=$(reserve_port)
 secondary=$(start_node ${low} 1.1.1)
 zold remote add localhost ${high} --home=${low} --skip-ping
 
-trap "kill -9 ${primary} ${secondary}" EXIT
+trap "halt_nodes ${high}" EXIT
 
 wait_for_file ${low}/restarted
 

data/fixtures/scripts/sigdump.sh

@@ -6,7 +6,7 @@ zold node --trace --invoice=NOPREFIX@ffffffffffffffff \
   --host=localhost --port=${port} --bind-port=${port} \
   --threads=0 --standalone &
 pid=$!
-trap "kill -9 $pid" EXIT
+trap "halt_nodes ${port}" EXIT
 
 wait_for_port ${port}
 

data/fixtures/scripts/spread-wallets.sh

@@ -4,7 +4,7 @@ function start_node {
   port=$(reserve_port)
   mkdir ${port}
   cd ${port}
-  zold node --trace --invoice=NOPREFIX@ffffffffffffffff \
+  zold node --trace --invoice=SPREADWALLETS@ffffffffffffffff \
     --host=localhost --port=${port} --bind-port=${port} \
     --threads=0 > log.txt &
   pid=$!
@@ -16,7 +16,7 @@ function start_node {
 
 first=$(start_node)
 second=$(start_node)
-trap "kill -9 $(cat ${first}/pid) $(cat ${second}/pid)" EXIT
+trap "halt_nodes ${first} ${second}" EXIT
 
 zold --home=${first} remote clean
 zold --home=${first} remote add localhost ${second}

data/lib/zold/commands/next.rb

@@ -0,0 +1,57 @@
+# 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.
+
+require 'slop'
+require_relative '../log'
+require_relative '../score'
+
+# NEXT command.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Calculate next score
+  class Next
+    def initialize(log: Log::Quiet.new)
+      @log = log
+    end
+
+    def run(args = [])
+      opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
+        o.banner = "Usage: zold next [options] score
+Available options:"
+        o.bool '--help', 'Print instructions'
+      end
+      if opts.help?
+        @log.info(opts.to_s)
+        return
+      end
+      calculate(opts)
+    end
+
+    private
+
+    def calculate(opts)
+      @log.info(Score.parse(opts.arguments[1]).next.to_s)
+    end
+  end
+end

data/lib/zold/commands/node.rb

@@ -93,6 +93,9 @@ module Zold
         o.string '--nohup-log',
           'The file to log output into (default: zold.log)',
           default: 'zold.log'
+        o.string '--halt-code',
+          'The value of HTTP query parameter "halt," which will cause the front-end immediate termination',
+          default: ''
         o.string '--save-pid',
           'The file to save process ID into right after start (only in NOHUP mode)'
         o.bool '--never-reboot',
@@ -111,6 +114,10 @@ module Zold
           "The name of the network (default: #{Wallet::MAIN_NETWORK})",
           require: true,
           default: Wallet::MAIN_NETWORK
+        o.integer '--nohup-max-cycles',
+          'Maximum amount of nohup re-starts (-1 by default, which means forever)',
+          require: true,
+          default: -1
         o.bool '--help', 'Print instructions'
       end
       if opts.help?
@@ -129,6 +136,7 @@ module Zold
       Front.set(:version, opts['expose-version'])
       Front.set(:protocol, Zold::PROTOCOL)
       Front.set(:logging, @log.debug?)
+      Front.set(:halt, opts['halt-code'])
       Front.set(:home, Dir.pwd)
       @log.info("Home directory: #{Dir.pwd}")
       @log.info("Ruby version: #{RUBY_VERSION}")
@@ -145,7 +153,7 @@ module Zold
         AccessLog: []
       )
       if opts['standalone']
-        @remotes = Remotes::Empty.new
+        @remotes = Zold::Remotes::Empty.new(file: '/tmp/standalone')
         @log.debug('Running in standalone mode! (will never talk to other remotes)')
       end
       Front.set(:ignore_score_weakness, opts['ignore-score-weakness'])
@@ -196,10 +204,10 @@ module Zold
             @log.info("Starting up the web front at http://#{host}:#{opts[:port]}...")
             Front.run!
             @log.info("The web front stopped at http://#{host}:#{opts[:port]}")
+            @log.info('Thanks for helping Zold network!')
           end
         end
       end
-      @log.info("The node #{host}:#{opts[:port]} is shut down, thanks for helping Zold network!")
     end
 
     private
@@ -238,19 +246,26 @@ module Zold
         end
         myself = File.expand_path($PROGRAM_NAME)
         args = ARGV.delete_if { |a| a.start_with?('--nohup', '--home') }
+        cycle = 0
         loop do
           begin
             code = exec("#{myself} #{args.join(' ')}", nohup_log)
-            if code != 0
-              nohup_log.print("Let's wait for a minute, because of the failure...")
-              sleep(60)
-            end
+            raise "Exit code is #{code}" if code != 0
             exec(opts['nohup-command'], nohup_log)
           rescue StandardError => e
             nohup_log.print(Backtrace.new(e).to_s)
-            nohup_log.print("Let's wait for a minutes, because of the exception...")
-            sleep(60)
+            if cycle < opts['nohup-max-cycles']
+              nohup_log.print("Let's wait for a minutes, because of the exception...")
+              sleep(60)
+            end
+          end
+          next if opts['nohup-max-cycles'].negative?
+          cycle += 1
+          if cycle > opts['nohup-max-cycles']
+            nohup_log.print("There are no more nohup cycles left, after the cycle no.#{cycle}")
+            break
           end
+          nohup_log.print("Going for nohup cycle no.#{cycle}")
         end
       end
       Process.detach(pid)

data/lib/zold/commands/remote.rb

@@ -207,10 +207,13 @@ Available options:"
     end
 
     def trim(opts)
-      @remotes.all.each do |r|
-        remove(r[:host], r[:port], opts) if r[:errors] > opts['tolerate']
+      all = @remotes.all
+      all.each do |r|
+        next if r[:errors] <= opts['tolerate']
+        remove(r[:host], r[:port], opts)
+        @log.info("#{r[:host]}:#{r[:port]} removed because of #{r[:errors]} errors (over #{opts['tolerate']})")
       end
-      @log.info("The list of remotes trimmed, #{@remotes.all.count} nodes left there")
+      @log.info("The list of #{all.count} remotes trimmed, #{@remotes.all.count} nodes left there")
     end
 
     def update(opts, deep = true)
@@ -256,7 +259,7 @@ in #{(Time.now - start).round(2)}s")
     end
 
     def select(opts)
-      selected = @remotes.all.sort_by { |r| r[:score] }.first(opts['max-nodes'])
+      selected = @remotes.all.sort_by { |r| r[:score] }.reverse.first(opts['max-nodes'])
       (@remotes.all - selected).each do |r|
         @remotes.remove(r[:host], r[:port])
       end

data/lib/zold/metronome.rb

@@ -55,7 +55,6 @@ module Zold
         @threads << Thread.start do
           Thread.current.abort_on_exception = true
           Thread.current.name = r.class.name
-          Thread.current.priority = -100
           step = 0
           while alive
             start = Time.now

data/lib/zold/node/farm.rb

@@ -78,7 +78,6 @@ module Zold
         Thread.new do
           Thread.current.abort_on_exception = true
           Thread.current.name = "f#{t}"
-          Thread.current.priority = -100
           loop do
             VerboseThread.new(@log).run do
               cycle(host, port, strength, threads)
@@ -90,7 +89,6 @@ module Zold
       @cleanup = Thread.new do
         Thread.current.abort_on_exception = true
         Thread.current.name = 'cleanup'
-        Thread.current.priority = -100
         while alive
           sleep(60) unless strength == 1 # which will only happen in tests
           VerboseThread.new(@log).run do
@@ -147,6 +145,9 @@ module Zold
       return unless s.strength >= strength
       Thread.current.name = s.to_mnemo
       save(threads, [s.next])
+      # score = Score.parse(`ruby #{File.join(File.dirname(__FILE__), '../../../bin/zold')} next "#{s}"`)
+      # @log.debug("New score discovered: #{score}")
+      # save(threads, [score])
       cleanup(host, port, strength, threads)
     end
 

data/lib/zold/node/front.rb

@@ -49,6 +49,7 @@ module Zold
       set :lock, false
       set :show_exceptions, false
       set :server, 'webrick'
+      set :halt, '' # to be injected at node.rb
       set :dump_errors, false # to be injected at node.rb
       set :version, VERSION # to be injected at node.rb
       set :protocol, PROTOCOL # to be injected at node.rb
@@ -69,6 +70,10 @@ module Zold
     use Rack::Deflater
 
     before do
+      if !settings.halt.empty? && params[:halt] && params[:halt] == settings.halt
+        settings.log.error('Halt signal received, shutting the front end down...')
+        Front.stop!
+      end
       check_header(Http::NETWORK_HEADER) do |header|
         if header != settings.network
           raise "Network name mismatch at #{request.url}, #{request.ip} is in '#{header}', \
@@ -119,6 +124,11 @@ while #{settings.address} is in '#{settings.network}'"
       settings.version
     end
 
+    get '/pid' do
+      content_type 'text/plain'
+      Process.pid.to_s
+    end
+
     get '/score' do
       content_type 'text/plain'
       score.to_s
@@ -143,6 +153,7 @@ while #{settings.address} is in '#{settings.network}'"
         score: score.to_h,
         pid: Process.pid,
         cpus: Concurrent.processor_count,
+        platform: RUBY_PLATFORM,
         uptime: `uptime`.strip,
         threads: "#{Thread.list.select { |t| t.status == 'run' }.count}/#{Thread.list.count}",
         wallets: settings.wallets.all.count,