bosh_vcloud_cpi 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcbdf7f3f5c6a9d0852c992f96b106ddd67503f0
-  data.tar.gz: a48e39654ba4916e2c28cf221f1e949ce4224e55
+  metadata.gz: 710aa4ae586bb095e7d141d87f370f32aea9b5a3
+  data.tar.gz: 244fc9bb0602ed4cb4de55cfdbccef20b91b1c66
 SHA512:
-  metadata.gz: ad0c6cd71dbe20b8e184e75660ff18d7cb727dee725b9c9a6f47f8f8f941a2b867cb2f3e5b03b8ad32c30af8282b501d37fdb7dbece810d0251416de5e9ef0fb
-  data.tar.gz: 0ccad8d4448fb37560df3cfbf6128ffe4caad3e833f463c398ec7d10998b9d24e5e7c3290bf5d8255b88ba618a1d4055a761675729303b31131a61635a1cdf83
+  metadata.gz: 622c767b56144f930d34a7241cc3f942a52553ef246277b8a9cac0c71dcbb57db0744d63a3bde2a19a13f83be359f0e561c60113d993f4fc10d3ad2d64f9bf38
+  data.tar.gz: 081218358ed1a0ecb744bad2953e67d83515ee8895ae01d2c363d6b68a6e4ac6cf96c5f16efe624608ee4c9e5a2cacf0d7df1a2bbef4f5a99baa238a1db29aa1

data/lib/cloud/vcloud/cloud.rb

@@ -1,5 +1,6 @@
 require 'securerandom'
 require 'logger'
+require 'common/common'
 
 require_relative 'errors'
 require_relative 'vcd_client'
@@ -22,8 +23,7 @@ module VCloudCloud
       @entities = @vcd['entities']
       raise ArgumentError, 'Invalid entities in VCD settings' unless @entities && @entities.is_a?(Hash)
 
-      @client_lock = Mutex.new # lock for establishing client connection
-      @vapp_lock   = Mutex.new # lock for recompose vApp and delete vm from vApp
+      @client = VCloudClient.new(@vcd, @logger)
     end
 
     def create_stemcell(image, _)
@@ -47,6 +47,8 @@ module VCloudCloud
       end
     end
 
+    def cpi_call_wait_time; 2; end
+
     def create_vm(agent_id, catalog_vapp_id, resource_pool, networks, disk_locality = nil, environment = nil)
       (steps "create_vm(#{agent_id}, #{catalog_vapp_id}, #{resource_pool}, ...)" do |s|
         # disk_locality should be an array of disk ids
@@ -61,6 +63,7 @@ module VCloudCloud
         storage_profiles = client.vdc.storage_profiles || []
         storage_profile = storage_profiles.find { |sp| sp['name'] == @entities['vapp_storage_profile'] }
 
+
         s.next Steps::Instantiate, catalog_vapp_id, vapp_name, description, disk_locality, storage_profile
         client.flush_cache  # flush cached vdc which contains vapp list
         vapp = s.state[:vapp]
@@ -76,45 +79,59 @@ module VCloudCloud
         # if the target vApp exists, creates a temp vApp, and then recomposes its VM to the target vApp.
         if requested_name
           container_vapp = nil
-          vm_href = nil
-          existing_vm_hrefs = []
 
-          # VM is added to the target vApp sequentially.
-          @vapp_lock.synchronize do
+          errors = [RuntimeError]
+          Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: 10, on: errors) do
             begin
-              @logger.debug "Requesting container vApp: #{requested_name}"
-              container_vapp = client.vapp_by_name requested_name
-            rescue ObjectNotFoundError
-              # ignored, keep container_vapp nil
-              @logger.debug "Invalid container vApp: #{requested_name}"
-            end
-
-            if container_vapp
-              existing_vm_hrefs = container_vapp.vms.map { |v| v.href }
-              s.next Steps::Recompose, container_vapp.name, container_vapp, vm
-              client.flush_cache
-              vapp = client.reload vapp
-              client.wait_entity vapp
               begin
-                s.next Steps::Delete, vapp, true
-              rescue => ex
-                @logger.warn "Caught exception when trying to delete tmp vapp #{vapp.name}: #{ex.to_s}"
+                @logger.debug "Requesting container vApp: #{requested_name}"
+                container_vapp = client.vapp_by_name requested_name
+              rescue ObjectNotFoundError
+                # ignored, keep container_vapp nil
+                @logger.debug "Invalid container vApp: #{requested_name}"
               end
-            else
-              # just rename the vApp
-              container_vapp = vapp
-              s.next Steps::Recompose, requested_name, container_vapp
+
+              if container_vapp
+                @logger.debug "Enter recompose, container_vapp: #{container_vapp.name}"
+                begin
+                  s.next Steps::Recompose, container_vapp.name, container_vapp, vm
+                rescue VCloudCloud::ObjectExistsError => e
+                  @logger.debug "VM already exists, skip the error"
+                end
+              else
+                # just rename the vApp
+                container_vapp = vapp
+                s.next Steps::Recompose, requested_name, container_vapp
+              end
+            rescue Exception => e
+              @logger.warn "Caught an exception during create_vm Exception #{e}, Type #{e.class} Message #{e.message}"
+              @logger.warn "Exception trace #{e.backtrace.join('\n')}"
+              raise "re raising exception #{e.message} in create_vm"
             end
+          end
 
-            # reload all the stuff
-            client.flush_cache
-            vapp = client.reload container_vapp
-            client.wait_entity vapp
-            vm_href = vapp.vms.map { |v| v.href } - existing_vm_hrefs
+          # delete tmp vapp only if the name is different from requested
+          client.flush_cache
+          vapp = client.reload vapp
+          client.wait_entity vapp, true
+          if vapp.name != requested_name
+            begin
+              s.next Steps::Delete, vapp, true
+            rescue Exception => ex
+              @logger.warn "Caught exception when trying to delete tmp vapp #{vapp.name}: #{ex.to_s}"
+            end
           end
 
-          raise "New virtual machine not found in recomposed vApp" if vm_href.empty?
-          s.state[:vm] = client.resolve_link vm_href[0]
+          # Wait for Delete/Recompose step to finish, retry if fails
+          # reload all the stuff
+          client.flush_cache
+          vapp = client.reload container_vapp
+          client.wait_entity vapp, true
+
+          vms = vapp.vms.select { |v| v.name == vm.name }
+
+          raise "New virtual machine not found in recomposed vApp" if vms.empty?
+          s.state[:vm] = client.resolve_link vms[0].href
         end
 
         # create env and generate env ISO image
@@ -123,17 +140,22 @@ module VCloudCloud
 
         # TODO refact this
         if requested_name
-          @vapp_lock.synchronize do
-            save_agent_env s
-            s.next Steps::PowerOn, :vm
+          errors = [RuntimeError]
+          Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: 20, on: errors) do
+            begin
+              save_agent_env s
+              s.next Steps::PowerOn, :vm
+            rescue Exception => e
+              @logger.warn "Caught an exception during create_vm Exception #{e}, Type #{e.class} Message #{e.message}"
+              @logger.warn "Exception trace #{e.backtrace.join('\n')}"
+              raise "re raising exception #{e.message} in create_vm"
+            end
           end
         else
           save_agent_env s
           s.next Steps::PowerOn, :vm
         end
 
-        # Update state to point to the correct vapp instead of the newly created temporary vapp for transition
-        # We do this as the final step to avoid problems such as rollback of Steps::Instantiate, which deletes state[:vapp]
         s.state[:vapp] = vapp
         s.state
       end)[:vm].urn
@@ -143,21 +165,28 @@ module VCloudCloud
       steps "reboot_vm(#{vm_id})" do |s|
         vm = s.state[:vm] = client.resolve_entity(vm_id)
 
-        @vapp_lock.synchronize do
-          if vm['status'] == VCloudSdk::Xml::RESOURCE_ENTITY_STATUS[:SUSPENDED].to_s
-            s.next Steps::DiscardSuspendedState, :vm
-            s.next Steps::PowerOn, :vm
-          elsif vm['status'] == VCloudSdk::Xml::RESOURCE_ENTITY_STATUS[:POWERED_OFF].to_s
-            s.next Steps::PowerOn, :vm
-          else
-            begin
-              s.next Steps::Reboot, :vm
-            rescue => ex
-              @logger.warn "Caught exception when trying to Reboot vm #{vm_id}: #{ex.to_s}"
-              @logger.debug 'Force a hard-reboot when failed to perform a soft-reboot'
-              s.next Steps::PowerOff, :vm, true
+        errors = [RuntimeError]
+        Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: 20, on: errors) do
+          begin
+            if vm['status'] == VCloudSdk::Xml::RESOURCE_ENTITY_STATUS[:SUSPENDED].to_s
+              s.next Steps::DiscardSuspendedState, :vm
+              s.next Steps::PowerOn, :vm
+            elsif vm['status'] == VCloudSdk::Xml::RESOURCE_ENTITY_STATUS[:POWERED_OFF].to_s
               s.next Steps::PowerOn, :vm
+            else
+              begin
+                s.next Steps::Reboot, :vm
+              rescue => ex
+                @logger.warn "Caught exception when trying to Reboot vm #{vm_id}: #{ex.to_s}"
+                @logger.debug 'Force a hard-reboot when failed to perform a soft-reboot'
+                s.next Steps::PowerOff, :vm, true
+                s.next Steps::PowerOn, :vm
+              end
             end
+          rescue Exception => e
+            @logger.warn "Caught an exception during reboot_vm Exception #{e}, Type #{e.class} Message #{e.message}"
+            @logger.warn "Exception trace #{e.backtrace.join('\n')}"
+            raise "re raising exception #{e.message} in reboot_vm"
           end
         end
       end
@@ -176,7 +205,9 @@ module VCloudCloud
       steps "delete_vm(#{vm_id})" do |s|
         vm = s.state[:vm] = client.resolve_entity vm_id
 
-        @vapp_lock.synchronize do
+        errors = [RuntimeError]
+        Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: 20, on: errors) do
+          begin
           # poweroff vm before we are able to delete it
           s.next Steps::PowerOff, :vm, true
 
@@ -191,6 +222,11 @@ module VCloudCloud
             s.next Steps::Undeploy, :vm
             s.next Steps::Delete, s.state[:vm], true
           end
+          rescue Exception => e
+            @logger.warn "Caught an exception during delete_vm Exception #{e}, Type #{e.class} Message #{e.message}"
+            @logger.warn "Exception trace #{e.backtrace.join('\n')}"
+            raise "re raising exception #{e.message} in delete_vm"
+          end
         end
 
         s.next Steps::DeleteCatalogMedia, vm.name
@@ -220,17 +256,24 @@ module VCloudCloud
 
         s.state[:disk]  = client.resolve_entity disk_id
 
-        @vapp_lock.synchronize do
-          s.next Steps::AttachDetachDisk, :attach
+        errors = [RuntimeError]
+        Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: 20, on: errors) do
+          begin
+            s.next Steps::AttachDetachDisk, :attach
 
-          # update environment
-          s.state[:env_metadata_key] = @entities['vm_metadata_key']
-          s.next Steps::LoadAgentEnv
+            # update environment
+            s.state[:env_metadata_key] = @entities['vm_metadata_key']
+            s.next Steps::LoadAgentEnv
 
-          vm = s.state[:vm] = client.reload vm
-          Steps::CreateOrUpdateAgentEnv.update_persistent_disk s.state[:env], vm, disk_id , previous_disks_list
+            vm = s.state[:vm] = client.reload vm
+            Steps::CreateOrUpdateAgentEnv.update_persistent_disk s.state[:env], vm, disk_id , previous_disks_list
 
-          save_agent_env s
+            save_agent_env s
+          rescue Exception => e
+            @logger.warn "Caught an exception during attach_disk Exception #{e}, Type #{e.class} Message #{e.message}"
+            @logger.warn "Exception trace #{e.backtrace.join('\n')}"
+            raise "re raising exception #{e.message} in attach_disk"
+          end
         end
       end
     end
@@ -242,21 +285,28 @@ module VCloudCloud
         # if disk is not attached, just ignore
         next unless vm.find_attached_disk s.state[:disk]
 
-        @vapp_lock.synchronize do
-          if vm['status'] == VCloudSdk::Xml::RESOURCE_ENTITY_STATUS[:SUSPENDED].to_s
-            s.next Steps::DiscardSuspendedState, :vm
-          end
-          s.next Steps::AttachDetachDisk, :detach
-
-          # update environment
-          s.state[:env_metadata_key] = @entities['vm_metadata_key']
-          s.next Steps::LoadAgentEnv
-          env = s.state[:env]
-          if env['disks'] && env['disks']['persistent'].is_a?(Hash)
-            env['disks']['persistent'].delete disk_id
-          end
+        errors = [RuntimeError]
+        Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: 20, on: errors) do
+          begin
+            if vm['status'] == VCloudSdk::Xml::RESOURCE_ENTITY_STATUS[:SUSPENDED].to_s
+              s.next Steps::DiscardSuspendedState, :vm
+            end
+            s.next Steps::AttachDetachDisk, :detach
+
+            # update environment
+            s.state[:env_metadata_key] = @entities['vm_metadata_key']
+            s.next Steps::LoadAgentEnv
+            env = s.state[:env]
+            if env['disks'] && env['disks']['persistent'].is_a?(Hash)
+              env['disks']['persistent'].delete disk_id
+            end
 
-          save_agent_env s
+            save_agent_env s
+          rescue Exception => e
+            @logger.warn "Caught an exception during detach_disk Exception #{e}, Type #{e.class} Message #{e.message}"
+            @logger.warn "Exception trace #{e.backtrace.join('\n')}"
+            raise "re raising exception #{e.message} in detach_disk"
+          end
         end
       end
     end
@@ -276,9 +326,6 @@ module VCloudCloud
     end
 
     def client
-      @client_lock.synchronize do
-        @client = VCloudClient.new(@vcd, @logger) if @client.nil?
-      end
       @client
     end
 

data/lib/cloud/vcloud/vcd_client.rb

@@ -95,8 +95,13 @@ module VCloudCloud
     end
 
     def vapp_by_name(name)
-      node = vdc.get_vapp name
+      # @logger.debug "VAPP_BY_NAME - org.vdc_link: #{org.vdc_link}"
+      vdc_link = org.vdc_link vdc_name
+      raise ObjectNotFoundError, "Invalid virtual datacenter name: #{vdc_name}" unless vdc_link
+      vdc_obj = resolve_link vdc_link
+      node = vdc_obj.get_vapp name
       raise ObjectNotFoundError, "vApp #{name} does not exist" unless node
+      @logger.debug "VAPP_BY_NAME - get a vapp name"
       resolve_link node.href
     end
 
@@ -119,7 +124,7 @@ module VCloudCloud
       session
 
       response = send_request method, path, options
-      (options[:no_wrap] || response.code == 204) ? nil : wrap_response(response)
+      (options[:no_wrap] || response.code == 204) ? response : wrap_response(response)
     end
 
     def upload_stream(url, size, stream, options = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vcloud_cpi
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -124,7 +124,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH vCloud CPI
-  a3d5f4
+  99eceb
 email: support@cloudfoundry.com
 executables: []
 extensions: []