openshift-origin-msg-broker-mcollective 1.2.6 → 1.2.7

data/lib/openshift/mcollective_application_container_proxy.rb

@@ -1106,6 +1106,17 @@ module OpenShift
         
         result = MCollectiveApplicationContainerProxy.sanitize_result(output, exitcode)
         #result.exitcode = exitcode
+
+        # raise an exception in case of non-zero exit code from the node
+        if result.exitcode != 0
+          result.debugIO << "Command return code: " + result.exitcode.to_s
+          if result.hasUserActionableError
+            raise OpenShift::UserException.new(result.errorIO.string, result.exitcode, result)
+          else
+            raise OpenShift::NodeException.new("Node execution failure (invalid exit code from node).  If the problem persists please contact Red Hat support.", 143, result)
+          end
+        end
+
         result
       end
       
@@ -1165,58 +1176,52 @@ module OpenShift
       end
       
       def run_cartridge_command(framework, app, gear, command, arg=nil, allow_move=true)
+        resultIO = nil
 
         arguments = "'#{gear.name}' '#{app.domain.namespace}' '#{gear.uuid}'"
         arguments += " '#{arg}'" if arg
 
         result = execute_direct(framework, command, arguments)
+
         begin
-          resultIO = parse_result(result, app, command)
-        rescue OpenShift::InvalidNodeException => e
-          if command != 'configure' && allow_move
-            @id = e.server_identity
-            Rails.logger.debug "DEBUG: Changing server identity of '#{gear.name}' from '#{gear.server_identity}' to '#{@id}'"
-            dns_service = OpenShift::DnsService.instance
-            dns_service.modify_application(gear.name, app.domain.namespace, get_public_hostname)
-            dns_service.publish
-            gear.server_identity = @id
-            app.save
-            #retry
-            result = execute_direct(framework, command, arguments)
-            resultIO = parse_result(result, app, command)
-          else
-            raise
-          end
-        end
-        Rails.logger.debug "DEBUG: Cartridge command #{framework}::#{command} exitcode = #{resultIO.exitcode}" 
-        if resultIO.exitcode != 0
-          resultIO.debugIO << "Cartridge return code: " + resultIO.exitcode.to_s
           begin
-            if resultIO.hasUserActionableError
-              raise OpenShift::UserException.new(resultIO.errorIO.string, resultIO.exitcode)
+            resultIO = parse_result(result, app, command)
+          rescue OpenShift::InvalidNodeException => e
+            if command != 'configure' && allow_move
+              @id = e.server_identity
+              Rails.logger.debug "DEBUG: Changing server identity of '#{gear.name}' from '#{gear.server_identity}' to '#{@id}'"
+              dns_service = OpenShift::DnsService.instance
+              dns_service.modify_application(gear.name, app.domain.namespace, get_public_hostname)
+              dns_service.publish
+              gear.server_identity = @id
+              app.save
+              #retry
+              result = execute_direct(framework, command, arguments)
+              resultIO = parse_result(result, app, command)
             else
-              raise OpenShift::NodeException.new("Node execution failure (invalid exit code from node).  If the problem persists please contact Red Hat support.", 143, resultIO)
+              raise
             end
-          rescue OpenShift::NodeException => e
-            if command == 'deconfigure'
-              if framework.start_with?('embedded/')
-                if has_embedded_app?(app.uuid, framework[9..-1])
-                  raise
-                else
-                  Rails.logger.debug "DEBUG: Component '#{framework}' in application '#{app.name}' not found on node '#{@id}'.  Continuing with deconfigure."
-                end
+          end
+        rescue OpenShift::NodeException => e
+          if command == 'deconfigure'
+            if framework.start_with?('embedded/')
+              if has_embedded_app?(app.uuid, framework[9..-1])
+                raise
               else
-                if has_app?(app.uuid, app.name)
-                  raise
-                else
-                  Rails.logger.debug "DEBUG: Application '#{app.name}' not found on node '#{@id}'.  Continuing with deconfigure."
-                end
+                Rails.logger.debug "DEBUG: Component '#{framework}' in application '#{app.name}' not found on node '#{@id}'.  Continuing with deconfigure."
               end
             else
-              raise
+              if has_app?(app.uuid, app.name)
+                raise
+              else
+                Rails.logger.debug "DEBUG: Application '#{app.name}' not found on node '#{@id}'.  Continuing with deconfigure."
+              end
             end
+          else
+            raise
           end
         end
+
         resultIO
       end
       

data/rubygem-openshift-origin-msg-broker-mcollective.spec

@@ -9,7 +9,7 @@
 
 Summary:        OpenShift plugin for mcollective service
 Name:           rubygem-%{gem_name}
-Version: 1.2.6
+Version: 1.2.7
 Release:        1%{?dist}
 Group:          Development/Languages
 License:        ASL 2.0
@@ -86,6 +86,9 @@ rm -rf %{buildroot}
 %attr(0644,-,-) %ghost /etc/mcollective/client.cfg
 
 %changelog
+* Mon Dec 10 2012 Adam Miller <admiller@redhat.com> 1.2.7-1
+- fix for bug 883607 (abhgupta@redhat.com)
+
 * Fri Dec 07 2012 Adam Miller <admiller@redhat.com> 1.2.6-1
 - Merge pull request #1035 from abhgupta/abhgupta-dev
   (openshift+bot@redhat.com)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openshift-origin-msg-broker-mcollective
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 2
-  - 6
-  version: 1.2.6
+  - 7
+  version: 1.2.7
 platform: ruby
 authors: 
 - Krishna Raman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-07 00:00:00 -05:00
+date: 2012-12-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency