bosh-director 1.5.0.pre.1269 → 1.5.0.pre.1274

data/lib/bosh/director.rb

@@ -55,7 +55,6 @@ require 'bosh/director/event_log'
 require 'bosh/director/task_result_file'
 require 'bosh/director/blob_util'
 
-require 'bosh/director/client'
 require 'bosh/director/agent_client'
 require 'cloud'
 require 'bosh/director/compile_task'

data/lib/bosh/director/agent_client.rb

@@ -1,11 +1,12 @@
 require 'bosh/director/agent_message_converter'
 
 module Bosh::Director
-  class AgentClient < Client
-
+  class AgentClient
     DEFAULT_POLL_INTERVAL = 1.0
 
-    def initialize(id, options = {})
+    attr_accessor :id
+
+    def self.with_defaults(id, options = {})
       defaults = {
         retry_methods: { # in case of timeout errors
                          get_state: 2,
@@ -14,32 +15,205 @@ module Bosh::Director
       }
 
       credentials = Bosh::Director::Models::Vm.find(:agent_id => id).credentials
-      if credentials
-        defaults.merge!(credentials: credentials)
-      end
-
-      super('agent', id, defaults.merge(options))
-    end
-
-    [
-      :prepare,
-      :apply,
-      :compile_package,
-      :drain,
-      :fetch_logs,
-      :migrate_disk,
-      :mount_disk,
-      :stop,
-      :unmount_disk,
-    ].each do |method|
-      define_method (method) do |*args|
-        task = AgentMessageConverter.convert_old_message_to_new(super(*args))
-        while task['state'] == 'running'
-          sleep(DEFAULT_POLL_INTERVAL)
-          task = AgentMessageConverter.convert_old_message_to_new(get_task(task['agent_task_id']))
+      defaults.merge!(credentials: credentials) if credentials
+
+      self.new('agent', id, defaults.merge(options))
+    end
+
+    def initialize(service_name, client_id, options = {})
+      @service_name = service_name
+      @client_id = client_id
+      @nats_rpc = Config.nats_rpc
+      @timeout = options[:timeout] || 45
+      @logger = Config.logger
+      @retry_methods = options[:retry_methods] || {}
+
+      if options[:credentials]
+        @encryption_handler =
+          Bosh::Core::EncryptionHandler.new(@client_id, options[:credentials])
+      end
+
+      @resource_manager = Api::ResourceManager.new
+    end
+
+    def method_missing(method_name, *args)
+      send_message(method_name, *args)
+    end
+
+    def prepare(*args)
+      send_long_running_message(:prepare, *args)
+    end
+
+    def apply(*args)
+      send_long_running_message(:apply, *args)
+    end
+
+    def compile_package(*args)
+      send_long_running_message(:compile_package, *args)
+    end
+
+    def drain(*args)
+      send_long_running_message(:drain, *args)
+    end
+
+    def fetch_logs(*args)
+      send_long_running_message(:fetch_logs, *args)
+    end
+
+    def migrate_disk(*args)
+      send_long_running_message(:migrate_disk, *args)
+    end
+
+    def mount_disk(*args)
+      send_long_running_message(:mount_disk, *args)
+    end
+
+    def unmount_disk(*args)
+      send_long_running_message(:unmount_disk, *args)
+    end
+
+    def stop(*args)
+      send_long_running_message(:stop, *args)
+    end
+
+    def wait_until_ready(deadline = 600)
+      old_timeout = @timeout
+      @timeout = 1.0
+      @deadline = Time.now.to_i + deadline
+
+      begin
+        ping
+      rescue RpcTimeout
+        retry if @deadline - Time.now.to_i > 0
+        raise RpcTimeout, "Timed out pinging to #{@client_id} after #{deadline} seconds"
+      rescue RpcRemoteException => e
+        retry if e.message =~ /^restarting agent/ && @deadline - Time.now.to_i > 0
+        raise e
+      ensure
+        @timeout = old_timeout
+      end
+    end
+
+    def handle_method(method_name, args)
+      result = {}
+      result.extend(MonitorMixin)
+
+      cond = result.new_cond
+      timeout_time = Time.now.to_f + @timeout
+
+      request = { :method => method_name, :arguments => args }
+
+      if @encryption_handler
+        @logger.info("Request: #{request}")
+        request = { "encrypted_data" => @encryption_handler.encrypt(request) }
+        request["session_id"] = @encryption_handler.session_id
+      end
+
+      recipient = "#{@service_name}.#{@client_id}"
+
+      request_id = @nats_rpc.send_request(recipient, request) do |response|
+        if @encryption_handler
+          begin
+            response = @encryption_handler.decrypt(response["encrypted_data"])
+          rescue Bosh::Core::EncryptionHandler::CryptError => e
+            response["exception"] = "CryptError: #{e.inspect} #{e.backtrace}"
+          end
+          @logger.info("Response: #{response}")
+        end
+
+        result.synchronize do
+          inject_compile_log(response)
+          result.merge!(response)
+          cond.signal
+        end
+      end
+
+      result.synchronize do
+        while result.empty?
+          timeout = timeout_time - Time.now.to_f
+          unless timeout > 0
+            @nats_rpc.cancel_request(request_id)
+            raise RpcTimeout,
+                  "Timed out sending `#{method_name}' to #{@client_id} " +
+                    "after #{@timeout} seconds"
+          end
+          cond.wait(timeout)
+        end
+      end
+
+      if result.has_key?("exception")
+        raise RpcRemoteException, format_exception(result["exception"])
+      end
+
+      result["value"]
+    end
+
+    # Returns formatted exception information
+    # @param [Hash|#to_s] exception Serialized exception
+    # @return [String]
+    def format_exception(exception)
+      return exception.to_s unless exception.is_a?(Hash)
+
+      msg = exception["message"].to_s
+
+      if exception["backtrace"]
+        msg += "\n"
+        msg += Array(exception["backtrace"]).join("\n")
+      end
+
+      if exception["blobstore_id"]
+        blob = download_and_delete_blob(exception["blobstore_id"])
+        msg += "\n"
+        msg += blob.to_s
+      end
+
+      msg
+    end
+
+    private
+
+    # the blob is removed from the blobstore once we have fetched it,
+    # but if there is a crash before it is injected into the response
+    # and then logged, there is a chance that we lose it
+    def inject_compile_log(response)
+      if response["value"] && response["value"].is_a?(Hash) &&
+        response["value"]["result"].is_a?(Hash) &&
+        blob_id = response["value"]["result"]["compile_log_id"]
+        compile_log = download_and_delete_blob(blob_id)
+        response["value"]["result"]["compile_log"] = compile_log
+      end
+    end
+
+    # Downloads blob and ensures it's deleted from the blobstore
+    # @param [String] blob_id Blob id
+    # @return [String] Blob contents
+    def download_and_delete_blob(blob_id)
+      blob = @resource_manager.get_resource(blob_id)
+      blob
+    ensure
+      @resource_manager.delete_resource(blob_id)
+    end
+
+    def send_message(message_name, *args)
+      retries = @retry_methods[message_name] || 0
+      begin
+        handle_method(message_name, args)
+      rescue RpcTimeout
+        if retries > 0
+          retries -= 1
+          retry
         end
-        task['value']
+        raise
+      end
+    end
+
+    def send_long_running_message(method_name, *args)
+      task = AgentMessageConverter.convert_old_message_to_new(send_message(method_name, *args))
+      while task['state'] == 'running'
+        sleep(DEFAULT_POLL_INTERVAL)
+        task = AgentMessageConverter.convert_old_message_to_new(get_task(task['agent_task_id']))
       end
+      task['value']
     end
   end
 end

data/lib/bosh/director/api/instance_manager.rb

@@ -38,7 +38,7 @@ module Bosh::Director
           raise VmAgentIdMissing, "VM `#{vm.cid}' doesn't have an agent id"
         end
 
-        AgentClient.new(vm.agent_id)
+        AgentClient.with_defaults(vm.agent_id)
       end
 
       def fetch_logs(user, deployment_name, job, index, options = {})

data/lib/bosh/director/cloudcheck_helper.rb

@@ -36,7 +36,7 @@ module Bosh::Director
         :retry_methods => { :get_state => retries }
       }
       @clients ||= {}
-      @clients[vm.agent_id] ||= AgentClient.new(vm.agent_id, options)
+      @clients[vm.agent_id] ||= AgentClient.with_defaults(vm.agent_id, options)
     end
 
     def agent_timeout_guard(vm, &block)

data/lib/bosh/director/deployment_plan/assembler.rb

@@ -151,7 +151,7 @@ module Bosh::Director
 
     def get_state(vm)
       @logger.debug("Requesting current VM state for: #{vm.agent_id}")
-      agent = AgentClient.new(vm.agent_id)
+      agent = AgentClient.with_defaults(vm.agent_id)
       state = agent.get_state
 
       @logger.debug("Received VM state: #{state.pretty_inspect}")
@@ -392,7 +392,7 @@ module Bosh::Director
 
         idle_vm.vm.update(:apply_spec => state)
 
-        agent = AgentClient.new(idle_vm.vm.agent_id)
+        agent = AgentClient.with_defaults(idle_vm.vm.agent_id)
         agent.apply(state)
         instance.current_state = state
       end

data/lib/bosh/director/instance_deleter.rb

@@ -50,7 +50,7 @@ module Bosh::Director
     # @param [String] agent_id agent id
     # @return [void]
     def drain(agent_id)
-      agent = AgentClient.new(agent_id)
+      agent = AgentClient.with_defaults(agent_id)
 
       drain_time = agent.drain("shutdown")
       if drain_time < 0

data/lib/bosh/director/instance_updater.rb

@@ -457,7 +457,7 @@ module Bosh::Director
         if @vm.agent_id.nil?
           raise VmAgentIdMissing, "VM #{@vm.id} is missing agent id"
         end
-        @agent = AgentClient.new(@vm.agent_id)
+        @agent = AgentClient.with_defaults(@vm.agent_id)
       end
     end
 

data/lib/bosh/director/jobs/delete_deployment.rb

@@ -108,7 +108,7 @@ module Bosh::Director
 
           if vm && vm.agent_id
             ignoring_errors_when_forced do
-              agent = AgentClient.new(vm.agent_id)
+              agent = AgentClient.with_defaults(vm.agent_id)
               agent.stop
             end
           end
@@ -117,7 +117,7 @@ module Bosh::Director
             if disk.active && vm && vm.cid && disk.disk_cid
               if vm.agent_id
                 ignoring_errors_when_forced do
-                  agent = AgentClient.new(vm.agent_id)
+                  agent = AgentClient.with_defaults(vm.agent_id)
                   agent.unmount_disk(disk.disk_cid)
                 end
               end

data/lib/bosh/director/jobs/vm_state.rb

@@ -44,7 +44,7 @@ module Bosh::Director
         index = nil
 
         begin
-          agent = AgentClient.new(vm.agent_id, :timeout => TIMEOUT)
+          agent = AgentClient.with_defaults(vm.agent_id, :timeout => TIMEOUT)
           agent_state = agent.get_state(@format)
           agent_state["networks"].each_value do |network|
             ips << network["ip"]

data/lib/bosh/director/package_compiler.rb

@@ -156,7 +156,7 @@ module Bosh::Director
       @logger.info("Configuring compilation VM: #{vm.cid}")
 
       begin
-        agent = AgentClient.new(vm.agent_id)
+        agent = AgentClient.with_defaults(vm.agent_id)
         agent.wait_until_ready
 
         configure_vm(vm, agent, network_settings)

data/lib/bosh/director/problem_scanner.rb

@@ -149,7 +149,7 @@ module Bosh::Director
         mounted_disk_cid = instance.persistent_disk_cid if instance
       end
 
-      agent = AgentClient.new(vm.agent_id, agent_options)
+      agent = AgentClient.with_defaults(vm.agent_id, agent_options)
       begin
         state = agent.get_state
 

data/lib/bosh/director/resource_pool_updater.rb

@@ -54,7 +54,7 @@ module Bosh::Director
       vm = VmCreator.new.create(deployment, stemcell, @resource_pool.cloud_properties,
                                 idle_vm.network_settings, nil, @resource_pool.env)
 
-      agent = AgentClient.new(vm.agent_id)
+      agent = AgentClient.with_defaults(vm.agent_id)
       agent.wait_until_ready
 
       update_state(agent, vm, idle_vm)

data/lib/bosh/director/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Director
-    VERSION = '1.5.0.pre.1269'
+    VERSION = '1.5.0.pre.1274'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1269
+  version: 1.5.0.pre.1274
   prerelease: 6
 platform: ruby
 authors:
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1269
+        version: 1.5.0.pre.1274
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1269
+        version: 1.5.0.pre.1274
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1269
+        version: 1.5.0.pre.1274
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1269
+        version: 1.5.0.pre.1274
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1269
+        version: 1.5.0.pre.1274
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1269
+        version: 1.5.0.pre.1274
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1269
+        version: 1.5.0.pre.1274
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1269
+        version: 1.5.0.pre.1274
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1269
+        version: 1.5.0.pre.1274
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1269
+        version: 1.5.0.pre.1274
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1269
+        version: 1.5.0.pre.1274
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1269
+        version: 1.5.0.pre.1274
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1269
+        version: 1.5.0.pre.1274
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1269
+        version: 1.5.0.pre.1274
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -445,7 +445,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  12f8ea'
+  6ac74e'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -523,7 +523,6 @@ files:
 - lib/bosh/director/app.rb
 - lib/bosh/director/blob_util.rb
 - lib/bosh/director/blobstores.rb
-- lib/bosh/director/client.rb
 - lib/bosh/director/cloudcheck_helper.rb
 - lib/bosh/director/compile_task.rb
 - lib/bosh/director/compiled_package_downloader.rb

data/lib/bosh/director/client.rb

@@ -1,156 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-module Bosh::Director
-  class Client
-
-    attr_accessor :id
-
-    def initialize(service_name, client_id, options = {})
-      @service_name = service_name
-      @client_id = client_id
-      @nats_rpc = Config.nats_rpc
-      @timeout = options[:timeout] || 45
-      @logger = Config.logger
-      @retry_methods = options[:retry_methods] || {}
-
-      if options[:credentials]
-        @encryption_handler =
-          Bosh::Core::EncryptionHandler.new(@client_id, options[:credentials])
-      end
-
-      @resource_manager = Api::ResourceManager.new
-    end
-
-    def method_missing(method_name, *args)
-      retries = @retry_methods[method_name] || 0
-      begin
-        handle_method(method_name, args)
-      rescue RpcTimeout
-        if retries > 0
-          retries -= 1
-          retry
-        end
-        raise
-      end
-    end
-
-    def wait_until_ready(deadline = 600)
-      old_timeout = @timeout
-      @timeout = 1.0
-      @deadline = Time.now.to_i + deadline
-
-      begin
-        ping
-      rescue RpcTimeout
-        retry if @deadline - Time.now.to_i > 0
-        raise RpcTimeout, "Timed out pinging to #{@client_id} after #{deadline} seconds"
-      rescue RpcRemoteException => e
-        retry if e.message =~ /^restarting agent/ && @deadline - Time.now.to_i > 0
-        raise e
-      ensure
-        @timeout = old_timeout
-      end
-    end
-
-    def handle_method(method_name, args)
-      result = {}
-      result.extend(MonitorMixin)
-
-      cond = result.new_cond
-      timeout_time = Time.now.to_f + @timeout
-
-      request = {:method => method_name, :arguments => args}
-
-      if @encryption_handler
-        @logger.info("Request: #{request}")
-        request = {"encrypted_data" => @encryption_handler.encrypt(request)}
-        request["session_id"] = @encryption_handler.session_id
-      end
-
-      recipient = "#{@service_name}.#{@client_id}"
-
-      request_id = @nats_rpc.send_request(recipient, request) do |response|
-        if @encryption_handler
-          begin
-            response = @encryption_handler.decrypt(response["encrypted_data"])
-          rescue Bosh::Core::EncryptionHandler::CryptError => e
-            response["exception"] = "CryptError: #{e.inspect} #{e.backtrace}"
-          end
-          @logger.info("Response: #{response}")
-        end
-
-        result.synchronize do
-          inject_compile_log(response)
-          result.merge!(response)
-          cond.signal
-        end
-      end
-
-      result.synchronize do
-        while result.empty?
-          timeout = timeout_time - Time.now.to_f
-          unless timeout > 0
-            @nats_rpc.cancel_request(request_id)
-            raise RpcTimeout,
-                  "Timed out sending `#{method_name}' to #{@client_id} " +
-                  "after #{@timeout} seconds"
-          end
-          cond.wait(timeout)
-        end
-      end
-
-      if result.has_key?("exception")
-        raise RpcRemoteException, format_exception(result["exception"])
-      end
-
-      result["value"]
-    end
-
-    # Returns formatted exception information
-    # @param [Hash|#to_s] exception Serialized exception
-    # @return [String]
-    def format_exception(exception)
-      return exception.to_s unless exception.is_a?(Hash)
-
-      msg = exception["message"].to_s
-
-      if exception["backtrace"]
-        msg += "\n"
-        msg += Array(exception["backtrace"]).join("\n")
-      end
-
-      if exception["blobstore_id"]
-        blob = download_and_delete_blob(exception["blobstore_id"])
-        msg += "\n"
-        msg += blob.to_s
-      end
-
-      msg
-    end
-
-    private
-
-    # the blob is removed from the blobstore once we have fetched it,
-    # but if there is a crash before it is injected into the response
-    # and then logged, there is a chance that we lose it
-    def inject_compile_log(response)
-      if response["value"] && response["value"].is_a?(Hash) &&
-        response["value"]["result"].is_a?(Hash) &&
-        blob_id = response["value"]["result"]["compile_log_id"]
-        compile_log = download_and_delete_blob(blob_id)
-        response["value"]["result"]["compile_log"] = compile_log
-      end
-    end
-
-    # Downloads blob and ensures it's deleted from the blobstore
-    # @param [String] blob_id Blob id
-    # @return [String] Blob contents
-    def download_and_delete_blob(blob_id)
-      blob = @resource_manager.get_resource(blob_id)
-      blob
-    ensure
-      @resource_manager.delete_resource(blob_id)
-    end
-
-  end
-end