beaker-benchmark 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3d7e588bdbad5a3f018e49fa02f007aa9a6b80c
-  data.tar.gz: b2f79746d5e092f9e4fbdca47fe02010167a7e17
+  metadata.gz: ad458e9ac88b6a8bd55c65a43f5af149db783f55
+  data.tar.gz: 4f5d4fcc934e32b208a11a11ab08367a7fd280f0
 SHA512:
-  metadata.gz: ad55ce1d5233f656f454b359491a12a21c04ece6dff547d6b0e687eb04fbdba234a29ee72038d0da1ac8f09eda556bee80840c38729475c3f1ac8b00e08426e1
-  data.tar.gz: ec1b08f2300581e6e8f20692b5f85084991561b6c9d611512cc9adc8143d6b41f32b28ae65a89e3e57941b28dd0f1062eaffc4c37a4f689eab1c2e70d34ccf24
+  metadata.gz: bcff00e5ba53f4248c64266863f6e67c600b964391c353b3f84dd441ced9bd0da5783f6054cdb9589e299eefdcc2ea29c8f31042a3e50d2d9ea43531db8a1fd2
+  data.tar.gz: c8cd012068de23ec1c350c4974957d6d0125a849708e85e16e655a8fbc8c4054e0f9338dafa5db8d5e7969c140a2d4c0bf1bfc43bae9e1099eb7c56eaac52184

data/acceptance/tests/measure_perf_on.rb

@@ -11,7 +11,7 @@ test_name "measure_perf_on test" do
     on master, 'sleep 10'
   end
 
-  assert(File.exist?('tmp/atop/ubuntu-server-1404-x64/atop_log_measure_perf_on_test_sleep_test.log'))
+  assert(File.exist?("tmp/atop/#{@@session_timestamp}/ubuntu-server-1404-x64/atop_log_measure_perf_on_test_sleep_test.log"))
   result.log_csv
-  assert(File.exist?('tmp/atop/ubuntu-server-1404-x64/atop_log_measure_perf_on_test_sleep_test.csv'))
+  assert(File.exist?("tmp/atop/#{@@session_timestamp}/ubuntu-server-1404-x64/atop_log_measure_perf_on_test_sleep_test.csv"))
 end

data/lib/beaker-benchmark/helpers.rb

@@ -1,5 +1,6 @@
 require 'csv'
 require 'fileutils'
+require 'time'
 
 module Beaker
   module DSL
@@ -28,7 +29,9 @@ module Beaker
         PROC_DISK_READ_INDEX = 11
         PROC_DISK_WRITE_INDEX = 13
 
-        TMP_DIR = 'tmp/atop'
+        @@session_timestamp = Time.now.getutc.to_i
+
+        TMP_DIR = "tmp/atop/#{@@session_timestamp}"
 
                 # Example usage:
         # test_name('measure_perf_on_puppetserver_start') {
@@ -63,12 +66,12 @@ module Beaker
 
         def start_monitoring(infrastructure_host, action_name, include_processes=false, sample_interval=1)
           raise('Monitoring already in progress, call stop_monitoring before calling start_monitoring a second time') unless @beaker_benchmark_start.nil?
-          @atop_log = "atop_log_#{action_name.downcase.gsub(/[^a-z0-9]/i, '_')}.log"
-          @action_name = action_name
+          @atop_log_filename = "atop_log_#{action_name.downcase.gsub(/[^a-z0-9]/i, '_')}.log"
+          @action_name       = action_name
           setup_atop(infrastructure_host)
           additional_args = ''
           additional_args = ',PRC,PRM,PRD' if include_processes
-          atop_cmd        = "sh -c 'nohup atop -P CPU,SWP,DSK#{additional_args} -i #{sample_interval} >  #{@atop_log} 2>&1 &'"
+          atop_cmd        = "sh -c 'nohup atop -P CPU,SWP,DSK#{additional_args} -i #{sample_interval} >  #{@atop_log_filename} 2>&1 &'"
 
           on(infrastructure_host, atop_cmd)
           @beaker_benchmark_start = Time.now
@@ -93,20 +96,20 @@ module Beaker
         end
 
         def parse_atop_log(infrastructure_host, duration)
-          unless infrastructure_host.file_exist?(@atop_log)
-            raise("atop log does not exist at #{@atop_log}")
+          unless infrastructure_host.file_exist?(@atop_log_filename)
+            raise("atop log does not exist at #{@atop_log_filename}")
           end
 
           log_dir = "#{TMP_DIR}/#{infrastructure_host.hostname}"
           FileUtils::mkdir_p log_dir unless Dir.exist? log_dir
-          scp_from(infrastructure_host, @atop_log, log_dir)
+          scp_from(infrastructure_host, @atop_log_filename, log_dir)
           cpu_usage  = []
           mem_usage  = []
           disk_read  = []
           disk_write = []
 
           skip        = true
-          CSV.parse(File.read(File.expand_path(File.basename(@atop_log), log_dir)), { :col_sep => ' ' }) do |row|
+          CSV.parse(File.read(File.expand_path(@atop_log_filename, log_dir)), { :col_sep => ' ' }) do |row|
             #skip the first entry, until the first separator 'SEP'.
             measure_type = row[MEASURE_TYPE_INDEX]
             if skip

data/lib/beaker-benchmark/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module BeakerBenchmark
 
       module Version
-        STRING = '0.0.2'
+        STRING = '0.0.3'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-benchmark
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec