bosh-director 1.3169.0 → 1.3173.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f50618663a0ca2e0709f9398f3081822fb89cd6
-  data.tar.gz: dbba3cb88e28c2165053b6d129348785c84272cb
+  metadata.gz: 6d4567ce799c76f18ac7476b9b1e15b2a2894921
+  data.tar.gz: 7f0bd2519325e7456084327985f5f6c2b9866603
 SHA512:
-  metadata.gz: f26778065b84c3e23443540a6055735634e692e39d55d4bcf99148db7c894bebd78be090d1b8a23c598cff7348e22bc42d655e9c8cbe5201adb5b232f6c88a08
-  data.tar.gz: 95e027b181a955e673ae093e7a4263b8ecb8c3afd8d0c184745eb590daa129bba462e45c3e3196ada8707c0e7e39e284458e1b9f6d90cda51caf7b919480248d
+  metadata.gz: a2592d11e754ce910e9ee1a454041d590f3a5d94057fadea2d765e16f6a3d9e9f8ef34a1d16cfb11fa11d67f20fbb4861b14c77b8c47a569d2af6d68c6448ce4
+  data.tar.gz: 5e601ad6cb42e5e6e2b3b6eb158e033bb8ddea9b6e6fa617be2518f1f6862b38c16024a100416a50c35166f89e801ad55968adfb2762b91e0034634f8d13f4bb

data/lib/bosh/director.rb

@@ -163,4 +163,5 @@ require 'bosh/director/api/controllers/task_controller'
 require 'bosh/director/api/controllers/users_controller'
 require 'bosh/director/api/controllers/cloud_configs_controller'
 require 'bosh/director/api/controllers/locks_controller'
+require 'bosh/director/api/controllers/restore_controller'
 require 'bosh/director/api/route_configuration'

data/lib/bosh/director/agent_client.rb

@@ -19,7 +19,7 @@ module Bosh::Director
 
     attr_accessor :id
 
-    def self.with_vm(vm, options = {})
+    def self.with_vm_credentials_and_agent_id(vm_credentials, agent_id, options = {})
       defaults = {
         retry_methods: {
           get_state: GET_STATE_MAX_RETRIES,
@@ -27,10 +27,9 @@ module Bosh::Director
         }
       }
 
-      credentials = vm.credentials
-      defaults.merge!(credentials: credentials) if credentials
+      defaults.merge!(credentials: vm_credentials) if vm_credentials
 
-      self.new('agent', vm.agent_id, defaults.merge(options))
+      self.new('agent', agent_id, defaults.merge(options))
     end
 
     def initialize(service_name, client_id, options = {})

data/lib/bosh/director/api.rb

@@ -26,6 +26,7 @@ require 'bosh/director/api/user/user_manager_provider'
 require 'bosh/director/api/vm_state_manager'
 require 'bosh/director/api/backup_manager'
 require 'bosh/director/api/resurrector_manager'
+require 'bosh/director/api/restore_manager'
 require 'bosh/director/api/cloud_config_manager'
 
 require 'bosh/director/api/instance_lookup'

data/lib/bosh/director/api/controllers/base_controller.rb

@@ -12,6 +12,7 @@ module Bosh::Director
           @identity_provider = config.identity_provider
           @deployment_manager = DeploymentManager.new
           @backup_manager = BackupManager.new
+          @restore_manager = RestoreManager.new
           @instance_manager = InstanceManager.new
           @resurrector_manager = ResurrectorManager.new
           @problem_manager = ProblemManager.new(@deployment_manager)

data/lib/bosh/director/api/controllers/deployments_controller.rb

@@ -18,6 +18,8 @@ module Bosh::Director
         json_encode(response)
       end
 
+      # PUT /deployments/foo/jobs/dea?new_name=dea_new or
+      # PUT /deployments/foo/jobs/dea?state={started,stopped,detached,restart,recreate}&skip_drain=true
       put '/:deployment/jobs/:job', :consumes => :yaml do
         options = {
           'job_states' => {
@@ -26,6 +28,7 @@ module Bosh::Director
             }
           }
         }
+        options['skip_drain'] = params[:job] if params['skip_drain'] == 'true'
 
         deployment = @deployment_manager.find_by_name(params[:deployment])
         manifest = ((request.content_length.nil?  || request.content_length.to_i == 0) && (params['state'])) ? StringIO.new(deployment.manifest) : request.body

data/lib/bosh/director/api/controllers/restore_controller.rb

@@ -0,0 +1,13 @@
+require 'bosh/director/api/controllers/base_controller'
+
+module Bosh::Director
+  module Api::Controllers
+    class RestoreController < BaseController
+      post '/', :consumes => :multipart do
+        @restore_manager.restore_db(params[:nginx_upload_path])
+
+        status 202
+      end
+    end
+  end
+end

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

@@ -41,7 +41,7 @@ module Bosh::Director
           raise VmAgentIdMissing, "VM `#{vm.cid}' doesn't have an agent id"
         end
 
-        AgentClient.with_vm(vm)
+        AgentClient.with_vm_credentials_and_agent_id(vm.credentials, vm.agent_id)
       end
 
       def fetch_logs(username, deployment_name, job, index_or_id, options = {})

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

@@ -0,0 +1,33 @@
+module Bosh::Director
+  module Api
+    class RestoreManager
+      def initialize
+        @logger = Config.logger
+        @db_config = Config.db_config
+      end
+
+      def restore_db(path)
+        @logger.debug("Restoring database from db_dump file: #{path}...")
+
+        db_name = @db_config.fetch('database')
+        adapter = @db_config.fetch('adapter')
+        user = @db_config.fetch('user')
+        pass = @db_config.fetch('password')
+        host = @db_config.fetch('host')
+
+        Process.spawn(
+          'sudo',
+          "LD_LIBRARY_PATH=#{ENV['LD_LIBRARY_PATH']}",
+          'restore-db',
+          adapter,
+          host,
+          user,
+          pass,
+          db_name,
+          path,
+          out: '/dev/null'
+        )
+      end
+    end
+  end
+end

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

@@ -12,6 +12,7 @@ module Bosh
           controllers = {}
           controllers['/backups'] = Bosh::Director::Api::Controllers::BackupsController.new(@config)
           controllers['/cleanup'] = Bosh::Director::Api::Controllers::CleanupController.new(@config)
+          controllers['/restore'] = Bosh::Director::Api::Controllers::RestoreController.new(@config)
           controllers['/cloud_configs'] = Bosh::Director::Api::Controllers::CloudConfigsController.new(@config)
           controllers['/deployments'] = Bosh::Director::Api::Controllers::DeploymentsController.new(@config)
           controllers['/disks'] = Bosh::Director::Api::Controllers::DisksController.new(@config)

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

@@ -20,7 +20,7 @@ module Bosh::Director
         end
 
         # remove old tasks
-        TaskRemover.new(Config.max_tasks).remove
+        TaskRemover.new(Config.max_tasks).remove(type)
 
         task.output = log_dir
         task.save

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

@@ -4,16 +4,16 @@ module Bosh::Director::Api
       @max_tasks = max_tasks
     end
 
-    def remove
-      removal_candidates_dataset.each do |task|
+    def remove (type)
+      removal_candidates_dataset(type).each do |task|
         FileUtils.rm_rf(task.output) if task.output
         task.destroy
       end
     end
 
     private
-    def removal_candidates_dataset
-      Bosh::Director::Models::Task.filter("state NOT IN ('processing', 'queued')").
+    def removal_candidates_dataset(type)
+      Bosh::Director::Models::Task.filter("state NOT IN ('processing', 'queued') and type='#{type}'").
         order{id.desc}.limit(2, @max_tasks)
     end
   end

data/lib/bosh/director/cloudcheck_helper.rb

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

data/lib/bosh/director/config.rb

@@ -101,8 +101,8 @@ module Bosh::Director
         # the default one does nothing
         @event_log = EventLog::Log.new
 
-        # by default keep only last 500 tasks in disk
-        @max_tasks = config.fetch('max_tasks', 500).to_i
+        # by default keep only last 100 tasks of each type in disk
+        @max_tasks = config.fetch('max_tasks', 100).to_i
 
         @max_threads = config.fetch('max_threads', 32).to_i
 

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

@@ -8,7 +8,7 @@ module Bosh::Director
 
       def get_state(vm_model)
         @logger.debug("Requesting current VM state for: #{vm_model.agent_id}")
-        agent = AgentClient.with_vm(vm_model)
+        agent = AgentClient.with_vm_credentials_and_agent_id(vm_model.credentials, vm_model.agent_id)
         state = agent.get_state
 
         @logger.debug("Received VM state: #{state.pretty_inspect}")

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

@@ -204,7 +204,7 @@ module Bosh::Director
       end
 
       def agent_client
-        @agent_client ||= AgentClient.with_vm(@model.vm)
+        @agent_client ||= AgentClient.with_vm_credentials_and_agent_id(@model.vm.credentials, @model.vm.agent_id)
       end
 
       ##

data/lib/bosh/director/disk_manager.rb

@@ -42,7 +42,7 @@ module Bosh::Director
       vm_model = instance.vm.model
       begin
         @cloud.attach_disk(vm_model.cid, disk_cid)
-        AgentClient.with_vm(vm_model).mount_disk(disk_cid)
+        AgentClient.with_vm_credentials_and_agent_id(vm_model.credentials, vm_model.agent_id).mount_disk(disk_cid)
       rescue => e
         @logger.warn("Failed to attach disk to new VM: #{e.inspect}")
         raise e
@@ -212,7 +212,7 @@ module Bosh::Director
     end
 
     def agent(instance)
-      AgentClient.with_vm(instance.vm.model)
+      AgentClient.with_vm_credentials_and_agent_id(instance.vm.model.credentials, instance.vm.model.agent_id)
     end
 
     def create_and_attach_disk(instance_plan, vm_recreator)

data/lib/bosh/director/instance_updater.rb

@@ -169,7 +169,7 @@ module Bosh::Director
     end
 
     def agent(instance)
-      AgentClient.with_vm(instance.model.vm)
+      AgentClient.with_vm_credentials_and_agent_id(instance.model.vm.credentials, instance.model.vm.agent_id)
     end
   end
 end

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

@@ -37,7 +37,7 @@ module Bosh::Director
         processes = []
 
         begin
-          agent = AgentClient.with_vm(vm, :timeout => TIMEOUT)
+          agent = AgentClient.with_vm_credentials_and_agent_id(vm.credentials, 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/models/instance.rb

@@ -96,10 +96,6 @@ module Bosh::Director::Models
       self.spec_json = Yajl::Encoder.encode(spec)
     end
 
-    def bind_to_vm_model(vm)
-      self.vm = vm
-    end
-
     def env
       if vm
         @env = vm.env

data/lib/bosh/director/problem_scanner/vm_scan_stage.rb

@@ -58,7 +58,7 @@ module Bosh::Director
 
       instance, mounted_disk_cid = @problem_register.get_vm_instance_and_disk(vm)
 
-      agent = AgentClient.with_vm(vm, agent_options)
+      agent = AgentClient.with_vm_credentials_and_agent_id(vm.credentials, vm.agent_id, agent_options)
       begin
         state = agent.get_state
 

data/lib/bosh/director/stopper.rb

@@ -23,7 +23,7 @@ module Bosh::Director
     private
 
     def agent_client
-      @agent_client ||= AgentClient.with_vm(@instance_model.vm)
+      @agent_client ||= AgentClient.with_vm_credentials_and_agent_id(@instance_model.vm.credentials, @instance_model.vm.agent_id)
     end
 
     def perform_drain

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3169.0'
+    VERSION = '1.3173.0'
   end
 end

data/lib/bosh/director/vm_creator.rb

@@ -60,7 +60,7 @@ module Bosh::Director
         instance.bind_to_vm_model(vm_model)
         VmMetadataUpdater.build.update(vm_model, {})
 
-        agent_client = AgentClient.with_vm(vm_model)
+        agent_client = AgentClient.with_vm_credentials_and_agent_id(vm_model.credentials, vm_model.agent_id)
         agent_client.wait_until_ready
         instance.update_trusted_certs
         instance.update_cloud_properties!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3169.0
+  version: 1.3173.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -674,6 +674,7 @@ files:
 - lib/bosh/director/api/controllers/packages_controller.rb
 - lib/bosh/director/api/controllers/releases_controller.rb
 - lib/bosh/director/api/controllers/resources_controller.rb
+- lib/bosh/director/api/controllers/restore_controller.rb
 - lib/bosh/director/api/controllers/resurrection_controller.rb
 - lib/bosh/director/api/controllers/stemcells_controller.rb
 - lib/bosh/director/api/controllers/task_controller.rb
@@ -691,6 +692,7 @@ files:
 - lib/bosh/director/api/property_manager.rb
 - lib/bosh/director/api/release_manager.rb
 - lib/bosh/director/api/resource_manager.rb
+- lib/bosh/director/api/restore_manager.rb
 - lib/bosh/director/api/resurrector_manager.rb
 - lib/bosh/director/api/route_configuration.rb
 - lib/bosh/director/api/snapshot_manager.rb