motherbrain 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92e848a7145f24eb7bcaee3193cb4445382e4dc5
-  data.tar.gz: f348b5cd5442d64ec7ecf4b575349fee037349cf
+  metadata.gz: 0fa9b41a671b085f2e3c08057bd1f2e3db7a61f2
+  data.tar.gz: eadec4b2bc486a6b52eedf09d9c630608c4927db
 SHA512:
-  metadata.gz: 30ba05db9263dc38a8a9d57bdb3351025e69ee13e5683e97e859b6ebe8f88abaa8e7afe49495f3b7a174f2e148f66eb3a0cb315739d852c12e1a3b264e7a2e9e
-  data.tar.gz: 8d2cf420dcfa7bede15b895f0b26f8b0a3d817a7e5473cc0449faae9c239b59f32b2c45821466e458af8ab4ccd7ed681d7ad269492c8dbede896922e01135a21
+  metadata.gz: 52cadf2941cdd996c6f5f869cdafc0758a1d20f910e28d5e66fb0d1e23410b9d72d07b045b3ba3656edc737605470a675b9e0f2028f8e3235a2e8120377e6e62
+  data.tar.gz: 035faec4ac2787b08b3491d49506caa3ac06a740c7ac37a1a8b8eb72122021051ff1c143c786a9a8863ba4ac44987aaef80b09346c87ace569933922559a9032

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.2.1
+
+* [#705](https://github.com/RiotGames/motherbrain/pull/705) Make connector_for_os public and ensure it is used for environment upgrades
+* [#704](https://github.com/RiotGames/motherbrain/pull/704) Ensure the component and service exist before attempting to execute the service state change
+* [#702](https://github.com/RiotGames/motherbrain/pull/702) Add a global error handler to help log unexpected, uncaught exceptions
+
 # 1.2.0
 
 * [#701](https://github.com/RiotGames/motherbrain/pull/701) Pass OS hints through to ridley-connectors for smarter connector picking

data/lib/mb/application.rb

@@ -63,6 +63,10 @@ module MotherBrain
       # @param [MB::Config] config
       def run!(config)
         Celluloid.boot
+        Celluloid.exception_handler do |ex|
+          log.fatal { "Application received unhandled exception: #{ex.class} - #{ex.message}" }
+          log.fatal { ex.backtrace.join("\n\t") }
+        end
         log.info { "motherbrain starting..." }
         setup
         @instance = Application::SupervisionGroup.new(config)

data/lib/mb/cli/sub_command/plugin.rb

@@ -164,7 +164,7 @@ module MotherBrain
                   service_options = Hash.new.merge(options).deep_symbolize_keys
                   service_options[:node_filter] = service_options.delete(:only)
 
-                  job = MB::Gear::DynamicService.change_service_state(
+                  job = plugin_manager.async_change_service_state(
                     service.freeze,
                     plugin.freeze,
                     environment.freeze,
@@ -172,7 +172,6 @@ module MotherBrain
                     true,
                     service_options
                   )
-
                   CliClient.new(job).display
                 end
 

data/lib/mb/environment_manager.rb

@@ -81,7 +81,7 @@ module MotherBrain
 
         job.set_status("Performing a chef client run on #{nodes.length} nodes")
         nodes.collect do |node|
-          node_querier.future(:chef_run, node.public_hostname, connector: node.chef_attributes.os)
+          node_querier.future(:chef_run, node.public_hostname, connector: node_querier.connector_for_os(node.chef_attributes.os))
         end.each do |future|
           begin
             response = future.value

data/lib/mb/gears/dynamic_service.rb

@@ -3,34 +3,6 @@ module MotherBrain
     class DynamicService < Gear::Base
       class << self
 
-        # Parses a service, creates a new instance of DynamicService
-        # and executes a Chef run to change the state of the service.
-        #
-        # @param service [String]
-        #   a dotted string "component.service_name"
-        # @param plugin [MB::Plugin]
-        #   the plugin currently in use
-        # @param environment [String]
-        #   the environment to operate on
-        # @param state [String]
-        #   the state of the service to change to
-        # @param options [Hash]
-        #
-        # @return [MB::JobTicket]
-        def change_service_state(service, plugin, environment, state, run_chef = true, options = {})
-          job = Job.new(:dynamic_service_state_change)
-
-          component, service_name = service.split('.')
-          raise InvalidDynamicService.new(component, service_name) unless component && service_name
-          dynamic_service = new(component, service_name)
-          dynamic_service.state_change(job, plugin, environment, state, run_chef, options)
-          job.report_success
-          job.ticket
-        rescue => ex
-          job.report_failure(ex)
-        ensure
-          job.terminate if job && job.alive?
-        end
       end
 
       include MB::Mixin::Services
@@ -72,19 +44,24 @@ module MotherBrain
       #
       # @return [MB::JobTicket]
       def state_change(job, plugin, environment, state, run_chef = true, options = {})
+        job.report_running
+        job.set_status("Transitioning #{@component}.#{@name} to #{state}...")
         log.warn {
           "Component's service state is being changed to #{state}, which is not one of #{COMMON_STATES}"
         } unless COMMON_STATES.include?(state)
 
         chef_synchronize(chef_environment: environment, force: options[:force]) do
-          component_object = plugin.component(component)
+          unless valid_dynamic_service?(plugin)
+            job.report_failure("#{@component}.#{@name} is not a valid service in #{plugin.name}")
+            return job
+          end
+
+         component_object = plugin.component(component)
           service_object = component_object.get_service(name)
           group = component_object.group(service_object.service_group)
           nodes = group.nodes(environment)
           nodes = MB::NodeFilter.filter(options[:node_filter], nodes) if options[:node_filter]
 
-          job.report_running("preparing to change the #{name} service to #{state}")
-
           if options[:cluster_override]
             set_environment_attribute(job, environment, service_object.service_attribute, state)
           else
@@ -95,6 +72,13 @@ module MotherBrain
             node_querier.bulk_chef_run(job, nodes, service_object.service_recipe)
           end
         end
+        job.set_status("Finished transitioning #{@component}.#{@name} to #{state}!")
+        job.report_success
+        job.ticket
+      rescue => ex
+        job.report_failure(ex)
+      ensure
+        job.terminate if job && job.alive?
       end
 
       def node_state_change(job, plugin, node, state, run_chef = true)
@@ -216,6 +200,25 @@ module MotherBrain
         end
       end
 
+      private
+
+        # Returns whether the component name and service name comprises a valid service contained in the plugin
+        #
+        # @param [MB::Plugin] plugin
+        #   the plugin to check for components
+        # 
+        # @return [Boolean]
+        def valid_dynamic_service?(plugin)
+          return false if plugin.nil? or @component.nil? or @name.nil?
+
+          component = plugin.component(@component)
+          return false if component.nil?
+
+          service = component.get_service(@name)
+          return false if service.nil?
+
+          true
+        end
     end
   end
 end

data/lib/mb/node_querier.rb

@@ -477,12 +477,6 @@ module MotherBrain
       job.terminate if job && job.alive?
     end
 
-    private
-
-    def finalize_callback
-      log.debug { "Node Querier stopping..." }
-    end
-
     # Returns a String representing the best connector
     # type to use when communicating with a given node
     #
@@ -501,6 +495,12 @@ module MotherBrain
       end
     end
 
+    private
+
+    def finalize_callback
+      log.debug { "Node Querier stopping..." }
+    end
+
     # Run a Ruby script on the target host and return the result of STDOUT. Only scripts
     # that are located in the Mother Brain scripts directory can be used and they should
     # be identified just by their filename minus the extension

data/lib/mb/plugin_manager.rb

@@ -509,6 +509,46 @@ module MotherBrain
       []
     end
 
+    # Runs #change_service_state asynchronously
+    #
+    # @param service [String]
+    #   a dotted string "component.service_name"
+    # @param plugin [MB::Plugin]
+    #   the plugin currently in use
+    # @param environment [String]
+    #   the environment to operate on
+    # @param state [String]
+    #   the state of the service to change to
+    # @param options [Hash]
+    #
+    # @return [MB::JobTicket]
+    def async_change_service_state(service, plugin, environment, state, run_chef = true, options = {})
+      job = Job.new(:dynamic_service_state_change)
+      async(:change_service_state, job, service, plugin, environment, state, run_chef, options)
+      job.ticket
+    end
+
+    # Parses a service, creates a new instance of DynamicService
+    # and executes a Chef run to change the state of the service.
+    #
+    # @param job [MB::Job]
+    #   the job to report status on
+    # @param service [String]
+    #   a dotted string "component.service_name"
+    # @param plugin [MB::Plugin]
+    #   the plugin currently in use
+    # @param environment [String]
+    #   the environment to operate on
+    # @param state [String]
+    #   the state of the service to change to
+    # @param options [Hash]
+    def change_service_state(job, service, plugin, environment, state, run_chef = true, options = {})
+      component_name, service_name = service.split('.')
+      dynamic_service = MB::Gear::DynamicService.new(component_name, service_name)
+      dynamic_service.state_change(job, plugin, environment, state, run_chef, options)
+    end
+
+
     protected
 
       def reconfigure(_msg, config)

data/lib/mb/version.rb

@@ -1,3 +1,3 @@
 module MotherBrain
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/spec/unit/mb/gears/dynamic_service_spec.rb

@@ -11,34 +11,6 @@ describe MB::Gear::DynamicService do
   let(:nodes) { [ node1, node2 ] }
   let(:node1) { double(name: nil, reload: nil, set_chef_attribute: nil, save: nil) }
   let(:node2) { double(name: nil, reload: nil, set_chef_attribute: nil, save: nil) }
-  let(:job) { MB::Job.new(:thejob) }
-  describe "ClassMethods" do
-    let(:service) { "webapp.tomcat" }
-
-    before do
-      dynamic_service.stub(:state_change)
-      MB::Job.should_receive(:new).and_return(job)
-    end
-
-    describe "::change_service_state" do
-      let(:change_service_state) { MB::Gear::DynamicService.change_service_state(service, plugin, environment, state) }
-
-      it "splits the service on a period" do
-        expect(MB::Gear::DynamicService).to receive(:new).with('webapp', 'tomcat').and_return(dynamic_service)
-        change_service_state
-      end
-
-      context "when the service is not formatted as 'COMPONENT.SERVICE'" do
-        let(:service) { "foo" }
-
-        it "raises an error" do
-          job.should_receive(:report_failure).with(kind_of(MB::InvalidDynamicService))
-          change_service_state
-        end
-      end
-    end
-  end
-
   let(:job) { double(alive?: false, report_running: nil, set_status: nil, report_success: nil, ticket: nil) }
 
   describe "#state_change" do
@@ -184,4 +156,49 @@ describe MB::Gear::DynamicService do
       set_node_attribute
     end
   end
+
+  describe "#valid_dynamic_service?" do
+    let(:plugin)         { double(MB::Plugin)                                         }
+    let(:component_name) { "component_name"                                           }
+    let(:component)      { double(MB::Component, name: component_name)                }
+    let(:service_name)   { "service_name"                                             }
+    let(:service)        { double(MB::Gear::DynamicService, name: service_name)       }
+
+    let(:check)          { subject.send(:valid_dynamic_service?, plugin)              }
+    
+    subject              { MB::Gear::DynamicService.new(component_name, service_name) }
+    
+    it "should return false when the plugin is nil" do
+      expect(subject.send(:valid_dynamic_service?, nil)).to be_false
+    end
+
+    context "should return false when the component_name is nil" do
+      let(:component_name) { nil }
+
+      it { expect(subject.send(:valid_dynamic_service?, plugin)).to be_false }
+    end
+
+    context "should return false when the service_name is nil" do
+      let(:service_name) { nil }
+
+      it { expect(subject.send(:valid_dynamic_service?, plugin)).to be_false }
+    end
+
+    it "should return false when the component cannot be found in the plugin" do
+      plugin.stub(:component).with(component_name).and_return nil
+      expect(check).to be_false
+    end
+
+    it "should return false when the service cannot be found in the plugin" do
+      plugin.stub(:component).with(component_name).and_return component
+      component.stub(:get_service).with(service_name).and_return nil
+      expect(check).to be_false
+    end
+
+    it "should return true when the service can be found in the component" do
+      plugin.stub(:component).with(component_name).and_return component
+      component.stub(:get_service).with(service_name).and_return service
+      expect(check).to be_true
+    end
+  end
 end

data/spec/unit/mb/node_querier_spec.rb

@@ -529,4 +529,32 @@ describe MB::NodeQuerier do
       end
     end
   end
+
+  describe "#connector_for_os" do
+    let(:connector_for_os) { subject.connector_for_os(os) }
+
+    context "when the os is windows" do
+      let(:os) { "windows" }
+
+      it "returns winrm" do
+        expect(connector_for_os).to eql("winrm")
+      end
+    end
+
+    context "when the os is linux" do
+      let(:os) { "linux" }
+
+      it "returns ssh" do
+        expect(connector_for_os).to eql("ssh")
+      end
+    end
+
+    context "when the os is not windows or linux" do
+      let(:os) { "solaris" }
+
+      it "returns nil" do
+        expect(connector_for_os).to be_nil
+      end
+    end
+  end
 end

data/spec/unit/mb/plugin_manager_spec.rb

@@ -721,4 +721,21 @@ describe MotherBrain::PluginManager do
       end
     end
   end
+
+  describe "#change_service_state" do
+    let(:component_name) { "component_name"   }
+    let(:service_name)   { "service_name"     }
+    let(:job)            { double(MB::Job)    }
+    let(:plugin)         { double(MB::Plugin) }
+    let(:environment)    { "environment"      }
+
+    it "should split the service compound name into the component and service names" do
+      dynamic_service = double(MB::Gear::DynamicService)
+      dynamic_service.stub(:state_change)
+
+      MB::Gear::DynamicService.should_receive(:new).with(component_name, service_name).and_return dynamic_service
+
+      subject.change_service_state(job, "#{component_name}.#{service_name}", plugin, environment, "start")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motherbrain
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid