bosh-director 1.2682.1.0 → 1.2685.0

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

@@ -0,0 +1,134 @@
+module Bosh::Director
+  class ProblemScanner::VmScanStage
+
+    AGENT_TIMEOUT_IN_SECONDS = 10
+
+    attr_reader :agent_disks
+
+    def initialize(instance_manager, problem_register, cloud, deployment, event_logger, logger)
+      @instance_manager = instance_manager
+      @problem_register = problem_register
+      @cloud = cloud
+      @deployment = deployment
+      @event_logger = event_logger
+      @logger = logger
+      @agent_disks = {}
+    end
+
+    def scan(vms=nil)
+      if vms
+        vm_list = []
+        vms.each do |job, index|
+          instance = @instance_manager.find_by_name(@deployment.name, job, index)
+          vm_list << instance.vm
+        end
+        vms = vm_list
+      else
+        vms = Models::Vm.eager(:instance).filter(deployment: @deployment).all
+      end
+
+      @event_logger.begin_stage("Scanning #{vms.size} VMs", 2)
+      results = Hash.new(0)
+      lock = Mutex.new
+
+      @event_logger.track_and_log('Checking VM states') do
+        ThreadPool.new(max_threads: Config.max_threads).wrap do |pool|
+          vms.each do |vm|
+            pool.process do
+              scan_result = scan_vm(vm)
+              lock.synchronize { results[scan_result] += 1 }
+            end
+          end
+        end
+      end
+
+      @event_logger.track_and_log("#{results[:ok]} OK, " +
+        "#{results[:unresponsive]} unresponsive, " +
+        "#{results[:missing]} missing, " +
+        "#{results[:unbound]} unbound, " +
+        "#{results[:out_of_sync]} out of sync")
+    end
+
+    private
+
+    def scan_vm(vm)
+      agent_options = {
+        timeout: AGENT_TIMEOUT_IN_SECONDS,
+        retry_methods: {get_state: 0}
+      }
+
+      instance, mounted_disk_cid = @problem_register.get_vm_instance_and_disk(vm)
+
+      agent = AgentClient.with_defaults(vm.agent_id, agent_options)
+      begin
+        state = agent.get_state
+
+        # gather mounted disk info. (used by scan_disk)
+        begin
+          disk_list = agent.list_disk
+          mounted_disk_cid = disk_list.first
+        rescue Bosh::Director::RpcTimeout
+          mounted_disk_cid = nil
+        rescue RuntimeError
+          # For old agents that doesn't implement list_disk we assume the disk is mounted
+          @logger.info("agent.list_disk failed on agent #{vm.agent_id}")
+        end
+        add_disk_owner(mounted_disk_cid, vm.cid) if mounted_disk_cid
+
+        return :out_of_sync if is_out_of_sync_vm?(vm, instance, state)
+        return :unbound if is_unbound_instance_vm?(vm, instance, state)
+        :ok
+      rescue Bosh::Director::RpcTimeout
+        # We add the disk to avoid a duplicate problem when timeouts fetching agent status (unresponsive_agent and
+        # mount_info_mismatch)
+        add_disk_owner(mounted_disk_cid, vm.cid) if mounted_disk_cid
+
+        begin
+          unless @cloud.has_vm?(vm.cid)
+            @logger.info("Missing VM #{vm.cid}")
+            @problem_register.problem_found(:missing_vm, vm)
+            return :missing
+          end
+        rescue Bosh::Clouds::NotImplemented
+        end
+
+        @logger.info("Found unresponsive agent #{vm.agent_id}")
+        @problem_register.problem_found(:unresponsive_agent, vm)
+        :unresponsive
+      end
+    end
+
+    def add_disk_owner(disk_cid, vm_cid)
+      @agent_disks[disk_cid] ||= []
+      @agent_disks[disk_cid] << vm_cid
+    end
+
+    def is_out_of_sync_vm?(vm, instance, state)
+      job = state['job'] ? state['job']['name'] : nil
+      index = state['index']
+      if state['deployment'] != @deployment.name ||
+        (instance && (instance.job != job || instance.index != index))
+        @problem_register.problem_found(:out_of_sync_vm, vm,
+          deployment: state['deployment'],
+          job: job, index: index)
+        true
+      else
+        false
+      end
+    end
+
+    def is_unbound_instance_vm?(vm, instance, state)
+      job = state['job'] ? state['job']['name'] : nil
+      index = state['index']
+      if job && !instance
+        @logger.info("Found unbound VM #{vm.agent_id}")
+
+        @problem_register.problem_found(:unbound_instance_vm, vm,
+          job: job, index: index)
+        true
+      else
+        false
+      end
+    end
+  end
+end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2682.1.0'
+    VERSION = '1.2685.0'
   end
 end

data/lib/cloud/dummy.rb

@@ -84,6 +84,10 @@ module Bosh
         File.exists?(vm_file(vm_id))
       end
 
+      def has_disk?(disk_id)
+        File.exists?(disk_file(disk_id))
+      end
+
       def configure_networks(vm_id, networks)
         cmd = commands.next_configure_networks_cmd(vm_id)
 
@@ -146,6 +150,11 @@ module Bosh
         Dir.glob(File.join(@running_vms_dir, '*')).map { |vm| File.basename(vm) }.shuffle
       end
 
+      def disk_cids
+        # Shuffle so that no one relies on the order of disks
+        Dir.glob(disk_file('*')).map { |disk| File.basename(disk) }.shuffle
+      end
+
       def kill_agents
         vm_cids.each do |agent_pid|
           begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2682.1.0
+  version: 1.2685.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -30,140 +30,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
 - !ruby/object:Gem::Dependency
   name: bosh_warden_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -460,7 +460,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  93a782
+  989d8b
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -518,13 +518,11 @@ files:
 - lib/bosh/director/api/api_helper.rb
 - lib/bosh/director/api/backup_manager.rb
 - lib/bosh/director/api/compiled_package_group_manager.rb
-- lib/bosh/director/api/controller.rb
 - lib/bosh/director/api/controller_helpers.rb
 - lib/bosh/director/api/controllers/backups_controller.rb
 - lib/bosh/director/api/controllers/base_controller.rb
 - lib/bosh/director/api/controllers/compiled_packages_controller.rb
 - lib/bosh/director/api/controllers/deployments_controller.rb
-- lib/bosh/director/api/controllers/errands_controller.rb
 - lib/bosh/director/api/controllers/info_controller.rb
 - lib/bosh/director/api/controllers/locks_controller.rb
 - lib/bosh/director/api/controllers/packages_controller.rb
@@ -532,6 +530,7 @@ files:
 - lib/bosh/director/api/controllers/resources_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
 - lib/bosh/director/api/controllers/tasks_controller.rb
 - lib/bosh/director/api/controllers/users_controller.rb
 - lib/bosh/director/api/deployment_lookup.rb
@@ -681,13 +680,17 @@ files:
 - lib/bosh/director/problem_handlers/base.rb
 - lib/bosh/director/problem_handlers/inactive_disk.rb
 - lib/bosh/director/problem_handlers/invalid_problem.rb
+- lib/bosh/director/problem_handlers/missing_disk.rb
 - lib/bosh/director/problem_handlers/missing_vm.rb
 - lib/bosh/director/problem_handlers/mount_info_mismatch.rb
 - lib/bosh/director/problem_handlers/out_of_sync_vm.rb
 - lib/bosh/director/problem_handlers/unbound_instance_vm.rb
 - lib/bosh/director/problem_handlers/unresponsive_agent.rb
 - lib/bosh/director/problem_resolver.rb
-- lib/bosh/director/problem_scanner.rb
+- lib/bosh/director/problem_scanner/disk_scan_stage.rb
+- lib/bosh/director/problem_scanner/problem_register.rb
+- lib/bosh/director/problem_scanner/scanner.rb
+- lib/bosh/director/problem_scanner/vm_scan_stage.rb
 - lib/bosh/director/rendered_job_templates_cleaner.rb
 - lib/bosh/director/resource_pool_updater.rb
 - lib/bosh/director/scheduler.rb

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

@@ -1,33 +0,0 @@
-require 'bosh/director/api/controllers/backups_controller'
-require 'bosh/director/api/controllers/deployments_controller'
-require 'bosh/director/api/controllers/packages_controller'
-require 'bosh/director/api/controllers/info_controller'
-require 'bosh/director/api/controllers/releases_controller'
-require 'bosh/director/api/controllers/resources_controller'
-require 'bosh/director/api/controllers/resurrection_controller'
-require 'bosh/director/api/controllers/stemcells_controller'
-require 'bosh/director/api/controllers/tasks_controller'
-require 'bosh/director/api/controllers/users_controller'
-require 'bosh/director/api/controllers/compiled_packages_controller'
-require 'bosh/director/api/controllers/errands_controller'
-require 'bosh/director/api/controllers/locks_controller'
-
-module Bosh::Director
-  module Api
-    class Controller < Sinatra::Base
-      use Controllers::BackupsController
-      use Controllers::DeploymentsController
-      use Controllers::InfoController
-      use Controllers::PackagesController
-      use Controllers::ReleasesController
-      use Controllers::ResourcesController
-      use Controllers::ResurrectionController
-      use Controllers::StemcellsController
-      use Controllers::TasksController
-      use Controllers::UsersController
-      use Controllers::CompiledPackagesController
-      use Controllers::ErrandsController
-      use Controllers::LocksController
-    end
-  end
-end

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

@@ -1,26 +0,0 @@
-require 'json'
-require 'bosh/director/api/controllers/base_controller'
-
-module Bosh::Director
-  module Api::Controllers
-    class ErrandsController < BaseController
-      post '/deployments/:deployment_name/errands/:errand_name/runs' do
-        deployment_name = params[:deployment_name]
-        errand_name = params[:errand_name]
-
-        task = JobQueue.new.enqueue(
-          @user,
-          Jobs::RunErrand,
-          "run errand #{errand_name} from deployment #{deployment_name}",
-          [deployment_name, errand_name],
-        )
-
-        redirect "/tasks/#{task.id}"
-      end
-
-      def body_params
-        @body_params ||= JSON.load(request.body)
-      end
-    end
-  end
-end