restructure perform method

Author: kathap

lib/cloud_controller/benchmark/blobstore.rb

@@ -14,60 +14,12 @@ def perform
         zip_output_dir = Dir.mktmpdir
         zip_file = zip_resources(resource_dir, zip_output_dir)
 
-        package_guid, resource_timing = upload_package(zip_file, package_blobstore_client)
-        puts("package upload timing fog: #{resource_timing * 1000}ms")
-        package_guid_cli, resource_timing_cli = upload_package(zip_file, package_blobstore_client_storage_cli)
-        puts("package upload timing storage-cli: #{resource_timing_cli * 1000}ms")
-
-        resource_timing = download_package(package_guid, resource_dir, package_blobstore_client)
-        puts("package download timing fog: #{resource_timing * 1000}ms")
-        resource_timing_cli = download_package(package_guid_cli, resource_dir, package_blobstore_client_storage_cli)
-        puts("package download timing storage-cli: #{resource_timing_cli * 1000}ms")
-
-        bytes_read, resource_timing = download_buildpacks(resource_dir, buildpack_blobstore_client)
-        bytes_read_cli, resource_timing_cli = download_buildpacks(resource_dir, buildpack_blobstore_client_storage_cli)
-        puts("downloaded #{Buildpack.count} buildpacks, total fog #{bytes_read} bytes read")
-        puts("downloaded #{Buildpack.count} buildpacks, total storage-cli  #{bytes_read_cli} bytes read")
-        puts("buildpack download timing fog: #{resource_timing * 1000}ms")
-        puts("buildpack download timing storage-cli: #{resource_timing_cli * 1000}ms")
-
-        droplet_guid, resource_timing = upload_droplet(zip_file, droplet_blobstore_client)
-        puts("droplet upload timing fog: #{resource_timing * 1000}ms")
-        droplet_guid_cli, resource_timing_cli = upload_droplet(zip_file, droplet_blobstore_client_storage_cli)
-        puts("droplet upload timing storage-cli: #{resource_timing_cli * 1000}ms")
-
-        resource_timing = download_droplet(droplet_guid, resource_dir, droplet_blobstore_client)
-        puts("droplet download timing fog: #{resource_timing * 1000}ms")
-        resource_timing_cli = download_droplet(droplet_guid_cli, resource_dir, droplet_blobstore_client_storage_cli)
-        puts("droplet download timing storage-cli: #{resource_timing_cli * 1000}ms")
-
-        big_droplet_file = Tempfile.new('big-droplet', resource_dir)
-        big_droplet_file.write('abc' * 1024 * 1024 * 100)
-        big_droplet_file.flush
-        big_droplet_file.rewind
-        big_droplet_guid, resource_timing = upload_droplet(big_droplet_file.path, droplet_blobstore_client)
-        big_droplet_file_cli = Tempfile.new('big-droplet', resource_dir)
-        big_droplet_file_cli.write('abc' * 1024 * 1024 * 100)
-        big_droplet_file_cli.flush
-        big_droplet_file_cli.rewind
-        big_droplet_guid_cli, resource_timing_cli = upload_droplet(big_droplet_file_cli.path, droplet_blobstore_client_storage_cli)
-        puts("big droplet upload timing fog: #{resource_timing * 1000}ms")
-        puts("big droplet upload timing storage-cli: #{resource_timing_cli * 1000}ms")
-        resource_timing = download_droplet(big_droplet_guid, resource_dir, droplet_blobstore_client)
-        puts("big droplet download timing fog: #{resource_timing * 1000}ms")
-        resource_timing_cli = download_droplet(big_droplet_guid_cli, resource_dir, droplet_blobstore_client_storage_cli)
-        puts("big droplet download timing storage-cli: #{resource_timing_cli * 1000}ms")
+        benchmark_packages(zip_file, resource_dir)
+        benchmark_buildpacks(resource_dir)
+        benchmark_droplets(zip_file, resource_dir)
+        benchmark_big_droplets(resource_dir)
       ensure
-        FileUtils.remove_dir(resource_dir, true)
-        FileUtils.remove_dir(zip_output_dir, true)
-        big_droplet_file.close
-        big_droplet_file_cli.close
-        package_blobstore_client.delete(package_guid) if package_guid
-        droplet_blobstore_client.delete(droplet_guid) if droplet_guid
-        droplet_blobstore_client.delete(big_droplet_guid) if big_droplet_guid
-        package_blobstore_client_storage_cli.delete(package_guid_cli) if package_guid_cli
-        droplet_blobstore_client_storage_cli.delete(droplet_guid_cli) if droplet_guid_cli
-        droplet_blobstore_client_storage_cli.delete(big_droplet_guid_cli) if big_droplet_guid_cli
+        cleanup(resource_dir, zip_output_dir)
       end
 
       def resource_match(dir_path)
@@ -80,18 +32,18 @@ def resource_match(dir_path)
         end
       end
 
-      def upload_package(package_path, client = package_blobstore_client)
+      def upload_package(package_path, client=package_blobstore_client)
         copy_to_blobstore(package_path, client)
       end
 
-      def download_package(package_guid, tmp_dir, client = package_blobstore_client)
+      def download_package(package_guid, tmp_dir, client=package_blobstore_client)
         tempfile = Tempfile.new('package-download-benchmark', tmp_dir)
         ::Benchmark.realtime do
           client.download_from_blobstore(package_guid, tempfile.path)
         end
       end
 
-      def download_buildpacks(tmp_dir, client = buildpack_blobstore_client)
+      def download_buildpacks(tmp_dir, client=buildpack_blobstore_client)
         tempfile = Tempfile.new('buildpack-download-benchmark', tmp_dir)
         bytes_read = 0
 
@@ -105,18 +57,100 @@ def download_buildpacks(tmp_dir, client = buildpack_blobstore_client)
         [bytes_read, timing]
       end
 
-      def upload_droplet(droplet_path, client = droplet_blobstore_client)
+      def upload_droplet(droplet_path, client=droplet_blobstore_client)
         copy_to_blobstore(droplet_path, client)
       end
 
-      def download_droplet(droplet_guid, tmp_dir, client = droplet_blobstore_client)
+      def download_droplet(droplet_guid, tmp_dir, client=droplet_blobstore_client)
         tempfile = Tempfile.new('droplet-download-benchmark', tmp_dir)
 
         ::Benchmark.realtime do
           client.download_from_blobstore(droplet_guid, tempfile.path)
         end
       end
 
+      def benchmark_packages(zip_file, resource_dir)
+        fog_guid, fog_time = upload_package(zip_file, package_blobstore_client)
+        cli_guid, cli_time = upload_package(zip_file, package_blobstore_client_storage_cli)
+
+        puts("package upload timing fog: #{fog_time * 1000}ms")
+        puts("package upload timing storage-cli: #{cli_time * 1000}ms")
+
+        fog_dl = download_package(fog_guid, resource_dir, package_blobstore_client)
+        cli_dl = download_package(cli_guid, resource_dir, package_blobstore_client_storage_cli)
+
+        puts("package download timing fog: #{fog_dl * 1000}ms")
+        puts("package download timing storage-cli: #{cli_dl * 1000}ms")
+
+        remember_cleanup(:package, fog_guid, cli_guid)
+      end
+
+      def benchmark_buildpacks(resource_dir)
+        fog_bytes, fog_time = download_buildpacks(resource_dir, buildpack_blobstore_client)
+        cli_bytes, cli_time = download_buildpacks(resource_dir, buildpack_blobstore_client_storage_cli)
+
+        puts("downloaded #{Buildpack.count} buildpacks, total fog #{fog_bytes} bytes read")
+        puts("downloaded #{Buildpack.count} buildpacks, total storage-cli #{cli_bytes} bytes read")
+        puts("buildpack download timing fog: #{fog_time * 1000}ms")
+        puts("buildpack download timing storage-cli: #{cli_time * 1000}ms")
+      end
+
+      def benchmark_droplets(zip_file, resource_dir)
+        fog_guid, fog_time = upload_droplet(zip_file, droplet_blobstore_client)
+        cli_guid, cli_time = upload_droplet(zip_file, droplet_blobstore_client_storage_cli)
+
+        puts("droplet upload timing fog: #{fog_time * 1000}ms")
+        puts("droplet upload timing storage-cli: #{cli_time * 1000}ms")
+
+        fog_dl = download_droplet(fog_guid, resource_dir, droplet_blobstore_client)
+        cli_dl = download_droplet(cli_guid, resource_dir, droplet_blobstore_client_storage_cli)
+
+        puts("droplet download timing fog: #{fog_dl * 1000}ms")
+        puts("droplet download timing storage-cli: #{cli_dl * 1000}ms")
+
+        remember_cleanup(:droplet, fog_guid, cli_guid)
+      end
+
+      def benchmark_big_droplets(resource_dir)
+        fog_guid, fog_time = upload_big_droplet(resource_dir, droplet_blobstore_client)
+        cli_guid, cli_time = upload_big_droplet(resource_dir, droplet_blobstore_client_storage_cli)
+
+        puts("big droplet upload timing fog: #{fog_time * 1000}ms")
+        puts("big droplet upload timing storage-cli: #{cli_time * 1000}ms")
+
+        fog_dl = download_droplet(fog_guid, resource_dir, droplet_blobstore_client)
+        cli_dl = download_droplet(cli_guid, resource_dir, droplet_blobstore_client_storage_cli)
+
+        puts("big droplet download timing fog: #{fog_dl * 1000}ms")
+        puts("big droplet download timing storage-cli: #{cli_dl * 1000}ms")
+
+        remember_cleanup(:droplet, fog_guid, cli_guid)
+      end
+
+      def remember_cleanup(type, fog_guid, cli_guid)
+        cleanup_items << [type, fog_guid, cli_guid]
+      end
+
+      def cleanup(resource_dir, zip_output_dir)
+        FileUtils.remove_dir(resource_dir, true)
+        FileUtils.remove_dir(zip_output_dir, true)
+
+        cleanup_items.each do |type, fog_guid, cli_guid|
+          client_fog, client_cli =
+            case type
+            when :package then [package_blobstore_client, package_blobstore_client_storage_cli]
+            when :droplet then [droplet_blobstore_client, droplet_blobstore_client_storage_cli]
+            end
+
+          client_fog.delete(fog_guid) if fog_guid
+          client_cli.delete(cli_guid) if cli_guid
+        end
+      end
+
+      def cleanup_items
+        @cleanup_items ||= []
+      end
+
       private
 
       def generate_resources
@@ -153,23 +187,23 @@ def copy_to_blobstore(path, client)
       end
 
       def buildpack_blobstore_client
-        @buildpack_blobstore_client_fog ||= CloudController::DependencyLocator.instance.buildpack_blobstore(blobstore_type: 'fog')
+        @buildpack_blobstore_client ||= CloudController::DependencyLocator.instance.buildpack_blobstore(blobstore_type: 'fog')
       end
 
       def buildpack_blobstore_client_storage_cli
         @buildpack_blobstore_client_storage_cli ||= CloudController::DependencyLocator.instance.buildpack_blobstore(blobstore_type: 'storage-cli')
       end
 
       def droplet_blobstore_client
-        @droplet_blobstore_client_fog ||= CloudController::DependencyLocator.instance.droplet_blobstore(blobstore_type: 'fog')
+        @droplet_blobstore_client ||= CloudController::DependencyLocator.instance.droplet_blobstore(blobstore_type: 'fog')
       end
 
       def droplet_blobstore_client_storage_cli
         @droplet_blobstore_client_storage_cli ||= CloudController::DependencyLocator.instance.droplet_blobstore(blobstore_type: 'storage-cli')
       end
 
       def package_blobstore_client
-        @package_blobstore_client_fog ||= CloudController::DependencyLocator.instance.package_blobstore(blobstore_type: 'fog')
+        @package_blobstore_client ||= CloudController::DependencyLocator.instance.package_blobstore(blobstore_type: 'fog')
       end
 
       def package_blobstore_client_storage_cli