bosh-director 1.2743.0 → 1.2744.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 245617054defdaf1d59d62a2b911b652e0fe0bfd
-  data.tar.gz: 4080e6dd55fee17cd7191966fdba543e23020657
+  metadata.gz: e4cee2bd6e3bb7adc796a8186393aa66fe2ee576
+  data.tar.gz: 445106e21d6cab923712ce39ba8361a281cdcf4c
 SHA512:
-  metadata.gz: ee0ea8231bbf7a7c7424f774d6dee192daa0ec4bf0a04af82dfbb180abaed049b5942dbb6dfc7ed0db8c980528e7f7bd7cbef816686456acb46837a2aa198107
-  data.tar.gz: 0a1291cad3c5c220f7c06d3ae4f7bc1fdf5125bb8a5d132b570803a2781c6993dc3197d11c3efa9706817ac17c77762357e3fe028f4f2ce5ec30d0e236bcce1e
+  metadata.gz: 95f7010920733b0a152213bdb828adf68bc37a0e2292ff9c475878a012864b8b60054d1ccc5688c7232058eaafca5dc4ec17f79d661b46f67111a5121585ddfd
+  data.tar.gz: 74911aeb27b67a599232fc92936961d8e4d54666888d246c3e03330b555cd50089159be5afc861a89e6bd917b42912d0fc8509bd4b824cc54d4af80dbca821d3

data/bin/bosh-director-worker

@@ -67,8 +67,14 @@ rescue Resque::NoQueueError
 end
 
 Resque.after_fork do
-  EM.error_handler { |e| puts "Error raised during event loop: #{e.message}" }
-  Thread.new { EM.run }
+  EM.error_handler { |e| puts "Error raised during event loop: #{e.inspect}, backtrace: #{e.backtrace}" }
+  Thread.new do
+    EM.run do
+      # connect to NATS on EM thread
+      # EM::connect will throw unbound errors if run from a different thread.
+      Bosh::Director::Config.nats
+    end
+  end
 end
 
 Resque::Failure.backend = Resque::Failure::Backtrace

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

@@ -273,6 +273,21 @@ module Bosh::Director
 
         redirect "/tasks/#{task.id}"
       end
+
+      get '/:deployment_name/errands' do
+        deployment = @deployment_manager.find_by_name(params[:deployment_name])
+
+        manifest = Psych.load(deployment.manifest)
+        deployment_plan = DeploymentPlan::Planner.parse(manifest, {}, Config.event_log, Config.logger)
+
+        errands = deployment_plan.jobs.select(&:can_run_as_errand?)
+
+        errand_data = errands.map do |errand|
+          { "name" => errand.name }
+        end
+
+        json_encode(errand_data)
+      end
     end
   end
 end

data/lib/bosh/director/config.rb

@@ -35,6 +35,7 @@ module Bosh::Director
         :fix_stateful_nodes,
         :enable_snapshots,
         :max_vm_create_tries,
+        :nats_uri,
       ]
 
       CONFIG_OPTIONS.each do |option|
@@ -226,19 +227,13 @@ module Bosh::Director
         end
       end
 
-      def nats
-        @lock.synchronize do
-          if @nats.nil?
-            @nats = NATS.connect(:uri => @nats_uri, :autostart => false)
-          end
-        end
-        @nats
-      end
-
       def nats_rpc
-        @lock.synchronize do
-          if @nats_rpc.nil?
-            @nats_rpc = NatsRpc.new
+        # double-check locking to reduce synchronization
+        if @nats_rpc.nil?
+          @lock.synchronize do
+            if @nats_rpc.nil?
+              @nats_rpc = NatsRpc.new(@nats_uri)
+            end
           end
         end
         @nats_rpc

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

@@ -42,18 +42,14 @@ module Bosh::Director
       ERROR = 3
 
       def send_alert(instance, message)
-        nats = Bosh::Director::Config.nats
-        payload = Yajl::Encoder.encode(
-            {
-                "id"         => 'director',
-                "severity"   => ERROR,
-                "title"      => "director - snapshot failure",
-                "summary"    => "failed to snapshot #{instance.job}/#{instance.index}: #{message}",
-                "created_at" => Time.now.to_i
-            }
-        )
-
-        nats.publish('hm.director.alert', payload)
+        payload = {
+            'id'         => 'director',
+            'severity'   => ERROR,
+            'title'      => 'director - snapshot failure',
+            'summary'    => "failed to snapshot #{instance.job}/#{instance.index}: #{message}",
+            'created_at' => Time.now.to_i
+        }
+        Bosh::Director::Config.nats_rpc.send_message('hm.director.alert', payload)
       end
     end
   end

data/lib/bosh/director/nats_rpc.rb

@@ -1,47 +1,46 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
+  # Remote procedure call client wrapping NATS
   class NatsRpc
 
-    def initialize
-      @nats = Config.nats
+    def initialize(nats_uri)
+      @nats_uri = nats_uri
       @logger = Config.logger
       @lock = Mutex.new
       @inbox_name = "director.#{Config.process_uuid}"
       @requests = {}
-      subscribe_inbox
     end
 
-    def subscribe_inbox
-      @nats.subscribe("#{@inbox_name}.>") do |message, _, subject|
-        @logger.debug("RECEIVED: #{subject} #{message}")
-        begin
-          request_id = subject.split(".").last
-          callback = @lock.synchronize { @requests.delete(request_id) }
-          if callback
-            message = Yajl::Parser.new.parse(message)
-            callback.call(message)
-          end
-        rescue Exception => e
-          @logger.warn(e.message)
-        end
+    # Returns a lazily connected NATS client
+    def nats
+      @nats ||= connect
+    end
+
+    # Publishes a payload (encoded as JSON) without expecting a response
+    def send_message(client, payload)
+      message = Yajl::Encoder.encode(request)
+      @logger.debug("SENT: #{client} #{message}")
+      EM.schedule do
+        nats.publish(client, payload)
       end
     end
 
-    def send_request(client, request, &block)
+    # Sends a request (encoded as JSON) and listens for the response
+    def send_request(client, request, &callback)
       request_id = generate_request_id
       request["reply_to"] = "#{@inbox_name}.#{request_id}"
       @lock.synchronize do
-        @requests[request_id] = block
+        @requests[request_id] = callback
       end
       message = Yajl::Encoder.encode(request)
       @logger.debug("SENT: #{client} #{message}")
-      EM.next_tick do
-        @nats.publish(client, message)
+      EM.schedule do
+        subscribe_inbox
+        nats.publish(client, message)
       end
       request_id
     end
 
+    # Stops listening for a response
     def cancel_request(request_id)
       @lock.synchronize { @requests.delete(request_id) }
     end
@@ -50,5 +49,49 @@ module Bosh::Director
       SecureRandom.uuid
     end
 
+    private
+
+    def connect
+      # double-check locking to reduce synchronization
+      if @nats.nil?
+        @lock.synchronize do
+          if @nats.nil?
+            @nats = NATS.connect(:uri => @nats_uri, :autostart => false)
+          end
+        end
+      end
+      @nats
+    end
+
+    # subscribe to an inbox, if not already subscribed
+    def subscribe_inbox
+      # double-check locking to reduce synchronization
+      if @subject_id.nil?
+        # nats lazy-load needs to be outside the synchronized block
+        client = nats
+        @lock.synchronize do
+          if @subject_id.nil?
+            @subject_id = client.subscribe("#{@inbox_name}.>") do |message, _, subject|
+              handle_response(message, subject)
+            end
+          end
+        end
+      end
+    end
+
+    def handle_response(message, subject)
+      @logger.debug("RECEIVED: #{subject} #{message}")
+      begin
+        request_id = subject.split(".").last
+        callback = @lock.synchronize { @requests.delete(request_id) }
+        if callback
+          message = Yajl::Parser.new.parse(message)
+          callback.call(message)
+        end
+      rescue Exception => e
+        @logger.warn(e.message)
+      end
+    end
+
   end
 end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2743.0'
+    VERSION = '1.2744.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2743.0
+  version: 1.2744.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -30,154 +30,154 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
 - !ruby/object:Gem::Dependency
   name: bosh_warden_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2743.0
+        version: 1.2744.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -460,7 +460,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  01851c
+  7460f0
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -522,7 +522,6 @@ files:
 - 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

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

@@ -1,41 +0,0 @@
-require 'json'
-require 'bosh/director/api/controllers/base_controller'
-
-module Bosh::Director
-  module Api::Controllers
-    class ErrandsController < BaseController
-      get '/deployments/:deployment_name/errands' do
-        deployment = @deployment_manager.find_by_name(params[:deployment_name])
-
-        manifest = Psych.load(deployment.manifest)
-        deployment_plan = DeploymentPlan::Planner.parse(manifest, {}, Config.event_log, Config.logger)
-
-        errands = deployment_plan.jobs.select(&:can_run_as_errand?)
-
-        errand_data = errands.map do |errand| 
-          { "name" => errand.name }
-        end
-
-        json_encode(errand_data)
-      end
-
-      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