zold-stress 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ab86a1ae25c81f4ac5fb1c98279b618dbfaa977e926a3c760b13d06b53ad2fb
-  data.tar.gz: a20be8604c929d4b371db76655a176c3a3973941e9e79e7f2fed9defdc260a2a
+  metadata.gz: 298a325cf8b0b4dc1f0158e8295111a2564f91cf90734f7b8d3ff9e2bf19efe0
+  data.tar.gz: 463737afba3299a6333e18f2f527f140d338dc73b223b4c49f58aaf044c9aafe
 SHA512:
-  metadata.gz: 706d9e39efaac93346011db9869cbb83c45dc9c2ef8d22dee3382faa2dd7f790e8cd917ed0b9793ff21ddfd996d5f429cab9915d6ef69a058d4274736165592e
-  data.tar.gz: 3debbc344aaaa1d5a3841bc407c9d7bb323df226c8bb94c25be04e39bab22e9acdaf6ac1946e4c7ac3d30ba626cdc4fd7ea6f347408a5aeb524199569f541d8f
+  metadata.gz: abada0b527309a1f116fe74de753c96365b092675533608bcf9afbafedf2ae190e9727f3241399c4d6f5552d54f630f19c2830616bb53243daf478243bd64249
+  data.tar.gz: f3466ba90fc620c5340bbb621cd2ba52bd09f23d84451b8c771009f56444b7c025277801df7db4a91ba0c58437ffd39f7f5db4b25927acccbd2d47f531219f88

data/.rubocop.yml

@@ -2,7 +2,7 @@ AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.3.3
 
-Style/EndOfLine:
+Layout/EndOfLine:
   EnforcedStyle: lf
 Metrics/LineLength:
   Max: 120

data/bin/zold-stress

@@ -44,8 +44,8 @@ Thread.current.name = 'main'
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
-log = Zold::Log::Regular.new
-vlog = Zold::Log::Quiet.new
+log = Zold::Log::REGULAR
+vlog = Zold::Log::ERRORS
 
 begin
   opts = Slop.parse(ARGV, strict: false, suppress_errors: true) do |o|
@@ -74,22 +74,19 @@ Available options:"
       "Home directory (default: #{Dir.pwd})",
       default: Dir.pwd
     o.string '--network',
-      "The name of the network we work in (default: #{Zold::Wallet::MAIN_NETWORK}",
+      "The name of the network we work in (default: #{Zold::Wallet::MAINET}",
       required: true,
-      default: Zold::Wallet::MAIN_NETWORK
+      default: Zold::Wallet::MAINET
     o.bool '-h', '--help', 'Show these instructions'
     o.on '--verbose', 'Enable extra logging information' do
-      log = Zold::Log::Verbose.new
-      vlog = Zold::Log::Regular.new
+      log = Zold::Log::VERBOSE
+      vlog = Zold::Log::REGULAR
     end
     o.on '--no-colors', 'Disable colors in the ouput' do
       Rainbow.enabled = false
     end
   end
 
-  log = Zold::Log::Sync.new(log)
-  vlog = Zold::Log::Sync.new(vlog)
-
   if opts.help?
     log.info(opts.to_s)
     exit
@@ -112,7 +109,7 @@ Available options:"
   end
   copies = File.join(zoldata, 'copies')
 
-  stats = Zold::Stress::Stats.new
+  stats = Zold::Stress::Stats.new(log: vlog)
   summary = Zold::Stress::Summary.new(stats, opts['batch'])
   air = Zold::Stress::Air.new
   round = Zold::Stress::Round.new(
@@ -137,7 +134,7 @@ Available options:"
     round.pull
     round.match
     log.info(summary)
-    Zold::List.new(wallets: wallets, log: log).run(['list'] + opts.arguments) if (r % 10).zero?
+    round.list if (r % 10).zero?
   end
   s = Time.now
   loop do
@@ -147,7 +144,11 @@ Available options:"
     round.match
     log.info(summary)
   end
+  round.list
   unless air.fetch.empty?
+    air.fetch.each do |p|
+      log.info("  #{p[:source]} -> #{p[:target]} #{p[:amount]} #{Zold::Age.new(p[:pushed])}")
+    end
     raise "#{air.fetch.count} payments out of #{stats.total('paid')} are still somewhere, we lost them :("
   end
   log.info("Successfully sent and received #{Rainbow(stats.total('arrived')).green} transactions \

data/fixtures/scripts/_head.sh

@@ -8,6 +8,8 @@ export RUBYOPT="-W0"
 alias zold="zold --network=test"
 alias zold-stress="$1 --network=test"
 
+zold --version
+
 function reserve_port {
   python -c 'import socket; s=socket.socket(); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'
 }

data/fixtures/scripts/multi-node.sh

@@ -1,36 +1,47 @@
 #!/bin/bash
 
 function start_node {
-  port=$(reserve_port)
+  port=$1
   mkdir ${port}
   cd ${port}
+  zold remote clean
   zold node --trace --invoice=MULTINODE@ffffffffffffffff \
     --host=localhost --port=${port} --bind-port=${port} --dump-errors \
-    --no-metronome --halt-code=test --threads=1 --strength=2 > log.txt &
+    --no-metronome --halt-code=test --threads=1 --strength=3 --pretty=full > log.txt 2>&1 &
   pid=$!
   echo ${pid} > pid
   cd ..
-  wait_for_url http://localhost:${port}/
-  echo ${port}
+  wait_for_url "http://localhost:${port}/"
 }
 
-nodes=($(start_node) $(start_node) $(start_node) $(start_node))
+nodes=()
+for i in `seq 1 4`; do
+  port=$(reserve_port)
+  nodes+=($port)
+  start_node $port &
+done
+wait
+
 trap "halt_nodes ${nodes[*]}" EXIT
+
 for port in ${nodes[@]}; do
-  cd ${port}
-  zold remote clean
-  for friend in ${nodes[@]}; do
-    if [ "${port}" != "${friend}" ]; then
-      zold remote add localhost ${friend}
-    fi
-  done
-  cd ..
+  {
+    cd ${port}
+    for friend in ${nodes[@]}; do
+      if [ "${port}" != "${friend}" ]; then
+        zold remote add localhost ${friend}
+      fi
+    done
+    cd ..
+  } &
 done
+wait
 
 zold remote clean
 for port in ${nodes[@]}; do
-  zold remote add localhost ${port}
+  zold remote add localhost ${port} &
 done
+wait
 
 zold --public-key=id_rsa.pub create 0000000000000000
 zold --public-key=id_rsa.pub create abcdabcdabcdabcd
@@ -38,6 +49,5 @@ zold pay --private-key=id_rsa 0000000000000000 abcdabcdabcdabcd 4.95 'To test'
 zold push 0000000000000000 --ignore-score-weakness
 zold remove 0000000000000000
 
-zold-stress --rounds=8 --wait=10 --threads=${#nodes[@]} --pool=8 --batch=8 --private-key=id_rsa --ignore-score-weakness
-
-zold show
+# zold-stress --rounds=32 --wait=10 --threads=8 --pool=8 --batch=16 --private-key=id_rsa --ignore-score-weakness
+zold-stress --rounds=4 --wait=10 --threads=${#nodes[@]} --pool=8 --batch=8 --private-key=id_rsa --ignore-score-weakness

data/fixtures/scripts/simple-stress.sh

@@ -1,21 +1,21 @@
 #!/bin/bash
 
 function start_node {
-  port=$(reserve_port)
+  port=$1
   mkdir ${port}
   cd ${port}
   zold node --trace --invoice=SPREADWALLETS@ffffffffffffffff \
     --host=localhost --port=${port} --bind-port=${port} --dump-errors \
     --standalone --no-metronome --halt-code=test \
-    --threads=0 > log.txt &
+    --threads=0 --verbose --pretty=full 2>&1 &
   pid=$!
   echo ${pid} > pid
   cd ..
-  wait_for_url http://localhost:${port}/
-  echo ${port}
+  wait_for_url "http://localhost:${port}/"
 }
 
-port=$(start_node)
+port=$(reserve_port)
+start_node $port
 trap "halt_nodes ${port}" EXIT
 zold remote clean
 zold remote add localhost ${port}
@@ -26,5 +26,5 @@ zold pay --private-key=id_rsa 0000000000000000 abcdabcdabcdabcd 4.95 'To test'
 zold push 0000000000000000
 zold remove 0000000000000000
 
-# zold-stress --rounds=1000 --wait=5 --threads=12 --pool=16 --batch=8 --private-key=id_rsa
+# zold-stress --rounds=8 --wait=5 --threads=32 --pool=32 --batch=64 --private-key=id_rsa --verbose
 zold-stress --rounds=4 --wait=5 --threads=4 --pool=4 --batch=4 --private-key=id_rsa

data/lib/zold/stress/air.rb

@@ -32,25 +32,28 @@ module Zold::Stress
       @all = []
     end
 
-    def fetch
-      @all
+    def fetch(any = false)
+      @all.select { |p| any || p[:arrived].nil? }
     end
 
     def add(pmt)
       @mutex.synchronize do
+        raise "Payment already exists (#{@all.size} total): #{pmt}" if @all.find { |p| p[:details] == pmt[:details] }
         @all << pmt.merge(pushed: Time.now)
       end
     end
 
-    def delete(pmt)
+    def pulled(id)
       @mutex.synchronize do
-        @all.delete(pmt)
+        @all.select { |a| a[:target] == id }.each { |a| a[:pulled] = Time.now }
       end
     end
 
-    def pulled(id)
+    def arrived(pmt)
       @mutex.synchronize do
-        @all.select { |a| a[:target] == id }.each { |a| a[:pulled] = Time.now }
+        found = @all.find { |p| p[:details] == pmt[:details] }
+        raise "Payment doesn't exist (#{@all.size} total): #{pmt}" if found.nil?
+        found[:arrived] = Time.now
       end
     end
   end

data/lib/zold/stress/pmnts.rb

@@ -36,7 +36,7 @@ module Zold::Stress
   # Payments to send in a batch.
   class Pmnts
     def initialize(pvt:, wallets:, remotes:, stats:, opts:,
-      vlog: Zold::Log::Quiet.new, log: Zold::Log::Quiet.new)
+      vlog: Zold::Log::NULL, log: Zold::Log::NULL)
       @pvt = pvt
       @wallets = wallets
       @remotes = remotes

data/lib/zold/stress/pool.rb

@@ -38,7 +38,7 @@ module Zold::Stress
   # Pool of wallets.
   class Pool
     def initialize(wallets:, remotes:, copies:, stats:, opts:,
-      log: Zold::Log::Quiet.new, vlog: Zold::Log::Quiet.new)
+      log: Zold::Log::NULL, vlog: Zold::Log::NULL)
       @wallets = wallets
       @remotes = remotes
       @copies = copies

data/lib/zold/stress/round.rb

@@ -26,6 +26,7 @@ require 'zold/key'
 require 'zold/id'
 require 'zold/commands/push'
 require 'zold/commands/remote'
+require 'zold/commands/list'
 require_relative 'stats'
 require_relative 'pool'
 require_relative 'pmnts'
@@ -39,7 +40,7 @@ module Zold::Stress
   # Full round of stress test
   class Round
     def initialize(pvt:, wallets:, remotes:, copies:,
-      stats:, air:, opts:, log: Zold::Log::Quiet.new, vlog: Zold::Log::Quiet.new)
+      stats:, air:, opts:, log: Zold::Log::NULL, vlog: Zold::Log::NULL)
       @pvt = pvt
       @wallets = wallets
       @remotes = remotes
@@ -51,6 +52,10 @@ module Zold::Stress
       @vlog = vlog
     end
 
+    def list
+      Zold::List.new(wallets: @wallets, copies: @copies, log: @log).run(['list'] + @opts.arguments)
+    end
+
     def update
       start = Time.now
       cmd = Zold::Remote.new(remotes: @remotes, log: @vlog)
@@ -74,6 +79,7 @@ module Zold::Stress
       )
       pool.rebuild
       @wallets.all.peach(@opts['threads']) do |id|
+        Thread.current.name = 'prepare-push'
         @stats.exec('push') do
           Zold::Push.new(wallets: @wallets, remotes: @remotes, log: @vlog).run(
             ['push', id.to_s, "--network=#{@opts['network']}"] + @opts.arguments
@@ -95,6 +101,7 @@ in #{Zold::Age.new(start)}")
       mutex = Mutex.new
       sources = sent.group_by { |p| p[:source] }
       sources.peach(@opts['threads']) do |a|
+        Thread.current.name = 'send-push'
         @stats.exec('push') do
           Zold::Push.new(wallets: @wallets, remotes: @remotes, log: @vlog).run(
             ['push', a[0].to_s, "--network=#{@opts['network']}"] + @opts.arguments
@@ -109,16 +116,17 @@ in #{Zold::Age.new(start)}")
 sent from #{sources.count} wallets, \
 in #{Zold::Age.new(start)}, #{@air.fetch.count} are now in the air, \
 #{Zold::Age.new(@air.fetch.map { |a| a[:pushed] }.reverse[0] || Time.now)} is the oldest")
-      @log.debug("  #{sent.map { |p| "#{p[:source]} -> #{p[:target]} #{p[:amount]}" }.join("\n  ")}")
+      @log.debug(sent.map { |p| "#{p[:source]} -> #{p[:target]} #{p[:amount]}" }.join("\n"))
     end
 
     def pull
       start = Time.now
       targets = @air.fetch.group_by { |p| p[:target] }.map { |a| a[0] }
       targets.peach(@opts['threads']) do |id|
+        Thread.current.name = "pull-#{id}"
         @stats.exec('pull') do
           Zold::Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @vlog).run(
-            ['pull', id.to_s, "--network=#{@opts['network']}"] + @opts.arguments
+            ['pull', id.to_s, "--network=#{@opts['network']}", '--skip-propagate'] + @opts.arguments
           )
         end
         @air.pulled(id)
@@ -134,11 +142,11 @@ after the pull of #{targets.count} in #{Zold::Age.new(start)}")
         next unless @wallets.acq(p[:target], &:exists?)
         t = @wallets.acq(p[:target], &:txns).find { |x| x.details == p[:details] && x.bnf == p[:source] }
         next if t.nil?
+        @air.arrived(p)
         @stats.put('arrived', p[:pulled] - p[:pushed])
         total += 1
         @log.debug("#{p[:amount]} arrived from #{p[:source]} to #{p[:target]} \
 in txn ##{t.id} in #{Zold::Age.new(p[:start])}: #{t.details}")
-        @air.delete(p)
       end
       @log.info("#{total} payments just arrived, #{@air.fetch.count} still in the air")
     end

data/lib/zold/stress/stats.rb

@@ -33,9 +33,10 @@ require 'zold/age'
 module Zold::Stress
   # Stats
   class Stats
-    def initialize
+    def initialize(log: Zold::Log::NULL)
       @history = {}
       @mutex = Mutex.new
+      @log = log
     end
 
     def exists?(metric)
@@ -78,6 +79,7 @@ module Zold::Stress
       put(metric + '_ok', Time.now - start)
     rescue StandardError => ex
       put(metric + '_error', Time.now - start)
+      @log.error(Backtrace.new(ex))
       raise ex unless swallow
     ensure
       put(metric, Time.now - start)

data/test/zold/stress/fake_node.rb

@@ -44,6 +44,7 @@ module Zold::Stress
       RandomPort::Pool::SINGLETON.acquire do |port|
         Dir.mktmpdir do |home|
           thread = Thread.start do
+            Thread.current.name = 'fake_node'
             Zold::VerboseThread.new(@log).run do
               node = Zold::Node.new(
                 wallets: Zold::Wallets.new(home),

data/test/zold/stress/test_air.rb

@@ -36,7 +36,22 @@ class AirTest < Minitest::Test
     air.fetch.each do |p|
       assert_equal(pmt[:details], p[:details])
     end
-    air.delete(air.fetch[0])
+    air.pulled(air.fetch[0][:target])
+    assert_equal(1, air.fetch.count)
+    air.arrived(air.fetch[0])
     assert_equal(0, air.fetch.count)
   end
+
+  def test_adds_and_removes_many
+    air = Zold::Stress::Air.new
+    5.times do |i|
+      pmt = { start: Time.now, source: Zold::Id::ROOT, target: Zold::Id::ROOT, details: i.to_s }
+      air.add(pmt)
+      assert_equal(i + 1, air.fetch.count)
+    end
+    air.pulled(air.fetch[0][:target])
+    assert_equal(5, air.fetch.count)
+    air.arrived(air.fetch[0])
+    assert_equal(4, air.fetch.count)
+  end
 end

data/test/zold/stress/test_bin.rb

@@ -36,7 +36,7 @@ class TestBin < Minitest::Test
   Dir.new('fixtures/scripts').select { |f| f =~ /\.sh$/ && !f.start_with?('_') }.each do |f|
     define_method("test_#{f.gsub(/\.sh$/, '').gsub(/[^a-z]/, '_')}") do
       start = Time.now
-      test_log.debug("\n\n#{f} running...")
+      test_log.info("\n\n#{f} running...")
       Dir.mktmpdir do |dir|
         FileUtils.cp('fixtures/id_rsa.pub', dir)
         FileUtils.cp('fixtures/id_rsa', dir)
@@ -49,7 +49,7 @@ class TestBin < Minitest::Test
             stdin.close
             until stdout.eof?
               line = stdout.gets
-              test_log.debug(line)
+              test_log.info(line)
               out << line
             end
             code = thr.value.to_i
@@ -57,7 +57,7 @@ class TestBin < Minitest::Test
           end
         end
       end
-      test_log.debug("\n\n#{f} done in #{Zold::Age.new(start)}")
+      test_log.info("\n\n#{f} done in #{Zold::Age.new(start)}")
     end
   end
 

data/test/zold/stress/test_round.rb

@@ -46,7 +46,7 @@ require_relative '../../../lib/zold/stress/air'
 
 class StressTest < Minitest::Test
   def test_runs_a_few_full_cycles
-    Zold::Stress::FakeNode.new(Zold::Log::Quiet.new).exec do |port|
+    Zold::Stress::FakeNode.new(Zold::Log::NULL).exec do |port|
       Dir.mktmpdir do |home|
         remotes = Zold::Remotes.new(file: File.join(home, 'remotes'), network: 'test')
         remotes.clean

data/test/zold/test__helper.rb

@@ -20,8 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-STDOUT.sync = true
-
 ENV['RACK_ENV'] = 'test'
 
 # require 'simplecov'
@@ -38,7 +36,7 @@ module Minitest
   class Test
     def test_log
       require 'zold/log'
-      @test_log ||= Zold::Log::Sync.new(ENV['TEST_QUIET_LOG'] ? Zold::Log::Quiet.new : Zold::Log::Verbose.new)
+      @test_log ||= ENV['TEST_QUIET_LOG'] ? Zold::Log::NULL : Zold::Log::VERBOSE
     end
 
     def test_opts(*argv)

data/zold-stress.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '2.2'
   s.required_ruby_version = '>=2.3'
   s.name = 'zold-stress'
-  s.version = '0.5.1'
+  s.version = '0.5.2'
   s.license = 'MIT'
   s.summary = 'Zold stress test'
   s.description = 'Stress testing toolkit for Zold network'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold-stress
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace