enhance benchmark output

Author: kathap

lib/cloud_controller/benchmark/blobstore.rb

@@ -46,33 +46,34 @@ def perform
         puts("downloaded #{Buildpack.count} buildpacks, total #{bytes_read} bytes read")
         log_timing('buildpack download timing', timing)
 
-        droplet_guid, timing = upload_droplet(zip_file)
-        log_timing('droplet upload timing', timing)
-        log_timing('droplet download timing', download_droplet(droplet_guid, resource_dir))
+        droplet_results = []
 
         SIZES.each do |label, bytes|
           Tempfile.create(["big-droplet-#{label}", '.bin'], resource_dir) do |tempfile|
             write_file_of_size(tempfile.path, bytes)
 
             guid, upload_timing = upload_droplet(tempfile.path)
             big_droplet_guids << guid
-            log_timing("big droplet #{label} upload timing", upload_timing)
-            log_timing("big droplet #{label} download timing", download_droplet(guid, resource_dir))
+            droplet_results << { label: "droplet #{label}", guid: guid, upload_timing: upload_timing }
           end
         end
+
+        droplet_results.each do |r|
+          log_timing("#{r[:label]} upload timing", r[:upload_timing])
+          log_timing("#{r[:label]} download timing", download_droplet(r[:guid], resource_dir))
+        end
       ensure
         FileUtils.remove_dir(resource_dir, true) if resource_dir
         FileUtils.remove_dir(zip_output_dir, true) if zip_output_dir
 
         safe_delete(package_blobstore_client, package_guid)
-        safe_delete(droplet_blobstore_client, droplet_guid)
         Array(big_droplet_guids).each { |g| safe_delete(droplet_blobstore_client, g) }
       end
 
       def resource_match(dir_path)
-        resources = Find.find(dir_path)
-                        .select { |f| File.file?(f) }
-                        .map { |f| { 'size' => File.stat(f).size, 'sha1' => Digester.new.digest_path(f) } }
+        resources = Find.find(dir_path).
+                    select { |f| File.file?(f) }.
+                    map { |f| { 'size' => File.stat(f).size, 'sha1' => Digester.new.digest_path(f) } }
 
         ::Benchmark.realtime do
           resource_pool.match_resources(resources)
@@ -155,9 +156,9 @@ def generate_resources
       def zip_resources(resource_dir, output_dir)
         zip_file = File.join(output_dir, 'zipped_package')
         Zip::File.open(zip_file, create: true) do |zipfile|
-          Find.find(resource_dir)
-              .select { |f| File.file?(f) }
-              .each { |file| zipfile.add(File.basename(file), file) }
+          Find.find(resource_dir).
+            select { |f| File.file?(f) }.
+            each { |file| zipfile.add(File.basename(file), file) }
         end
         zip_file
       end