Merge branch 'master' into hmusum/use-assertions-from-rubygem

Author: hmusum

docker/include/feature-flags.json

@@ -51,6 +51,7 @@
         { "id" : "max-uncommitted-memory", "rules" : [ { "value" : 130000 } ] },
         { "id" : "resource-limit-disk", "rules" : [ { "value" : 0.9 } ] },
         { "id" : "write-config-server-session-data-as-blob", "rules" : [ { "value" : true } ] },
+        { "id" : "send-protobuf-querytree", "rules" : [ { "value" : true } ] },
         { "id" : "unknown-config-definition", "rules" : [ { "value" : "fail" } ] },
         { "id" : "content-layer-metadata-feature-level", "rules" : [ { "value" : 1 } ] },
         { "id" : "search-core-transaction-log-replay-soft-memory-limit", "rules" : [ { "value" : -5 } ] },

lib/assertions.rb

@@ -4,4 +4,17 @@
 module Assertions
   include Test::Unit::Assertions
 
+  # Passes if the JSON parsed value of expected string is
+  # equal to the JSON parsed value of actual.
+  def assert_json_string_equal(expected, actual)
+      assert_equal(JSON.parse(expected), JSON.parse(actual))
+  end
+
+  # Converts parsed canonical tensors to objects and compares
+  def assert_tensors_equal(expected, actual)
+      exp = TensorResult.new(expected)
+      act = TensorResult.new(actual)
+      assert_equal(exp, act, "Tensors should be equal: Expected #{exp} != Actual #{act}")
+  end
+
 end

lib/bm25_scorer.rb

@@ -1,12 +1,12 @@
 # Copyright Vespa.ai. All rights reserved.
 
-require 'test/unit/assertions'
+require 'assertions'
 
 # Utility class to calculate bm25 scores for a document.
 # Used by Bm25FeatureTest and SameElementOperator
 
 class Bm25Scorer
-  include Test::Unit::Assertions
+  include Assertions
 
   attr_reader :avg_element_length
   attr_reader :avg_field_length

lib/document_api_v1.rb

@@ -1,6 +1,6 @@
 # Copyright Vespa.ai. All rights reserved.
 
-require 'test/unit/assertions'
+require 'assertions'
 require 'erb'
 require 'set'
 require 'http_connection_pool'
@@ -30,7 +30,7 @@ def on_document_count(doc_count)
 
 # Class to use the document rest api (v1) for feed, get, visit (https://docs.vespa.ai/documentation/document-api.html)
 class DocumentApiV1
-  include Test::Unit::Assertions
+  include Assertions
 
   attr_reader :host, :port
 

lib/nodetypes/storage.rb

@@ -1,6 +1,6 @@
 # Copyright Vespa.ai. All rights reserved.
 require "document.rb"
-require 'test/unit/assertions'
+require 'assertions'
 require 'bucket_copy'
 require 'nodetypes/storageclusterstate.rb'
 require 'environment'
@@ -39,7 +39,7 @@ def restart
 end
 
 class Storage
-  include Test::Unit::Assertions
+  include Assertions
 
   attr_accessor :distributor, :feeder, :fleetcontroller, :storage, :stress, :clustername
   attr_reader :bucket_crosscheck_params

lib/performance/system.rb

@@ -4,63 +4,65 @@
 
 module Perf
 
+  # Calculate cpu util for a time period, use start() and end()
   class System
     attr_reader :hostname
 
     def initialize(node, data = {})
       @node = node
-      @hostname = node.hostname
+      @hostname = node.hostname unless node == nil
       @data = data
       @start_cpu_used = 0
       @start_cpu_total = 0
       @end_cpu_used = 0
       @end_cpu_total = 0
-      @ysar_binary = propose_ysar_gather # TODO Remove dependency on internal tooling
     end
 
-    def propose_ysar_gather
-      @ysar_binary = "#{Environment.instance.vespa_home}/sbin/ysar_gather"
-      @ysar_binary = "/usr/sbin/ysar_gather" unless has_ysar
+    # For unit testing
+    def self.create_for_testing(hostname)
+      @hostname = hostname
+      new(nil)
     end
 
-    def has_ysar
-      @node.file?(@ysar_binary)
+    def cpu_usage
+      calculate_cpu_usage(@node.execute("cat /proc/stat", :noecho => true))
     end
 
-    def ysar_gather_cmd
-      "#{@ysar_binary} --list --delay-mode=none"
-    end
-
-    def load
-      unless has_ysar
-        return [0, 0]
-      end
-      output = @node.execute(ysar_gather_cmd, :noecho => true)
-      output.split("\n").each do |l|
-        if l =~ /^cput=/
-          key,value = l.split('=')
-          values = value.split(',').collect(&:to_i)
-
+    def calculate_cpu_usage(stat_output)
+      # See 'man proc_stat' for format. Basically this sums all cpu usage types and subtracts idle time to find cpu used
+      stat_output.split("\n").each do |line|
+        if line =~ /^cpu /
+          values = line.split(' ').collect(&:to_i)
+          values.delete(0) # Remove first item ('cpu')
           total = values.inject(:+)
-          used = total - values[4]
+          # Subtract idle time to find cpu usage
+          used = total - values[3]
 
           return [used, total]
         end
       end
 
-      return [0, 0]
+      [0, 0]
     end
 
     def start
-      @start_cpu_used, @start_cpu_total = load
+      @start_cpu_used, @start_cpu_total = cpu_usage
     end
 
     def end
-      @end_cpu_used, @end_cpu_total = load
-      cpu_util = (@end_cpu_used - @start_cpu_used).to_f / (@end_cpu_total - @start_cpu_total)
+      @end_cpu_used, @end_cpu_total = cpu_usage
+      set_cpu_util([@start_cpu_used, @start_cpu_total], [@end_cpu_used, @end_cpu_total])
+    end
+
+    def set_cpu_util(start_data, end_data)
+      cpu_util = (end_data[0] - start_data[0]).to_f / (end_data[1] - start_data[1]).to_f
       @data['cpuutil'] = cpu_util.nan? ? 0.0 : cpu_util
     end
 
+    def cpu_util
+      @data['cpuutil']
+    end
+
     def fill
       Proc.new do |result|
         result.add_metric('cpuutil', @data['cpuutil'], @hostname)

lib/test/stat_output_end.txt

@@ -0,0 +1,12 @@
+cpu  2755034 16808 1456367 173042706 7719 2816574 108368 0 0 0
+cpu0 685797 3110 361564 43255672 1177 711966 29935 0 0 0
+cpu1 687168 5049 364759 43258167 2339 705184 26893 0 0 0
+cpu2 692538 3254 364614 43263697 2158 699850 25656 0 0 0
+cpu3 689530 5394 365430 43265168 2044 699572 25883 0 0 0
+intr 1445969025 0 6636264 591611701 0 0 0 23 0 0 0 844414262 0 0 0 0 0 0 0 0 0 0 0 0 0 7374 0 0 0 24 0 3 5 0 0 0 16 0 160 402398 0 0 3 0 0 5 0 1404376 0 963393 529018 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ctxt 2507040035
+btime 1760582953
+processes 702537
+procs_running 1
+procs_blocked 0
+softirq 119678384 0 21829652 122 17066458 1308031 0 430 63152146 0 16321545

lib/test/stat_output_start.txt

@@ -0,0 +1,12 @@
+cpu  2745670 16808 1449026 172238106 7687 2803796 107300 0 0 0
+cpu0 683460 3110 359716 43054709 1170 708656 29642 0 0 0
+cpu1 684784 5049 362895 43057120 2330 701954 26628 0 0 0
+cpu2 690206 3254 362803 43062430 2150 696701 25398 0 0 0
+cpu3 687219 5394 363611 43063845 2034 696483 25631 0 0 0
+intr 1442433360 0 6624196 590984852 0 0 0 23 0 0 0 841531182 0 0 0 0 0 0 0 0 0 0 0 0 0 7340 0 0 0 24 0 3 5 0 0 0 16 0 156 391687 0 0 3 0 0 5 0 1402901 0 962570 528397 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ctxt 2501296161
+btime 1760582953
+processes 694100
+procs_running 2
+procs_blocked 0
+softirq 118835475 0 21603679 122 17063113 1306592 0 422 62703317 0 16158230

lib/test/test_result_model.rb

@@ -25,31 +25,6 @@ def parameter(name)
 
 class ResultModelTest < Test::Unit::TestCase
 
-  def notest_readwrite
-    begin
-      f = Tempfile.new('result.xml')
-      path = f.path
-      f.close
-      r = Perf::Result.new('5.0')
-
-      r.fbench = { 'runtime' => 555, '99p' => '5.5', '95p' => '1.5', 'successfulrequests' => 5 }
-      host = flexmock(Perf::System.new('localhost'))
-      host.should_receive(:data).and_return({ 'cpu_util' => 99.98 })
-      r.add_host host
-
-      r.write(path)
-
-      r2 = Perf::Result.read(path)
-
-      assert_equal(r.vespa_version, r2.vespa_version)
-      assert_equal(r.fbench['successfulrequests'], r2.fbench['successfulrequests'])
-      assert_equal(r.hosts.size, r2.hosts.size)
-      assert_equal(r.host('localhost').data['cpu_util'], r2.host('localhost').data['cpu_util'])
-    ensure
-      File.unlink(path)
-    end
-  end
-
   def test_custom_producer_parsing
     # Float
     m1 = MockModel.new("1.5")

lib/test/test_system.rb

@@ -1,38 +1,17 @@
 # Copyright Vespa.ai. All rights reserved.
-require 'flexmock/test_unit'
-require 'rubygems'
-require 'test/unit'
-
 require 'performance/system'
+require 'test/unit'
 
 class SystemTest < Test::Unit::TestCase
-  class MockResult
-    attr_reader :metrics
-    def initialize
-      @metrics = {}
-    end
-
-    def add_metric(name, value, tag)
-      @metrics[name + ':' + tag] = value
-    end
-  end
 
   def test_cpuutil
-    node = flexmock('node')
-    node.should_receive(:file?).and_return(true)
-    node.should_receive(:execute).times(2).
-      and_return(IO.read(File.join(File.dirname(__FILE__), "ysar_gather_output.txt")),
-                 IO.read(File.join(File.dirname(__FILE__), "ysar_gather_output2.txt")))
-    node.should_receive(:hostname).
-      and_return('localhost')
-    system = flexmock(Perf::System.new(node, {}))
-    system.start
-    system.end
-    filler = system.fill
-    result = MockResult.new
-    filler.call(result)
-    assert_in_delta(0.999900049975012,
-                    result.metrics['cpuutil:localhost'],
+    system = Perf::System.create_for_testing('localhost')
+    start_cpu_used, start_cpu_total = system.calculate_cpu_usage(IO.read(File.join(File.dirname(__FILE__), "stat_output_start.txt")))
+    end_cpu_used, end_cpu_total = system.calculate_cpu_usage(IO.read(File.join(File.dirname(__FILE__), "stat_output_end.txt")))
+    system.set_cpu_util([start_cpu_used, start_cpu_total], [end_cpu_used, end_cpu_total])
+
+    assert_in_delta(0.03661832197254973,
+                    system.cpu_util,
                     0.00000001)
   end