bosh_vsphere_cpi 1.3012.0 → 1.3016.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3319f77ebc915e2fd96306db03797dda3a32b6ee
-  data.tar.gz: 1073fd38d6b2cefdcbb584388363d2ea006a5ed9
+  metadata.gz: 6c61a2fd7f8813ae36703f920a3e4f80379b35aa
+  data.tar.gz: e2d98c14a4ddbdc145cf17fea60de324fe2cc8e5
 SHA512:
-  metadata.gz: 4fba1c81c9390216eef161cafaeb59b379d5a9dbcbeb77fa0ff89ea32bac8901640fc2a7207fb493a11ba59213918c97591669c21b6f5be25b167925e78c77c7
-  data.tar.gz: 19af7d1b5400b117ca5299b6949152fa0591fccda99932e6fd0b61c686523f3a30eb475393f6bbea80d3d62acb40988f57275570de2ddd286027e091257d11c3
+  metadata.gz: f5e4bd7d512cd05bce61c73cb39c1155e7efc189d6b0d3bd2cf4ccf8f456b0c6cabd0775a1284431a60f922a578ff5e20049d856c541ecda91ce970f20fc230a
+  data.tar.gz: 8075f67026ba56ae50fe8f9d74407fd1c20da9f8e1f57b849765732cbcaa4dc8ded95bb2ea03a874752ef0863b2cd7faff50410740e2bfe03c60a3bf2f8c837f

data/lib/cloud/vsphere/client.rb

@@ -4,6 +4,7 @@ module VSphereCloud
 
     class TaskException < StandardError; end
     class FileNotFoundException < TaskException; end
+    class DuplicateName < TaskException; end
     class AlreadyLoggedInException < StandardError; end
     class NotLoggedInException < StandardError; end
 
@@ -270,6 +271,7 @@ module VSphereCloud
     def task_exception_for_vim_fault(fault)
       exceptions_by_fault = {
         VimSdk::Vim::Fault::FileNotFound => FileNotFoundException,
+        VimSdk::Vim::Fault::DuplicateName => DuplicateName,
       }
       exceptions_by_fault.fetch(fault.class, TaskException).new(fault.msg)
     end

data/lib/cloud/vsphere/cloud.rb

@@ -35,13 +35,6 @@ module VSphereCloud
       @file_provider = FileProvider.new(config.rest_client, config.vcenter_host)
       @agent_env = AgentEnv.new(client, @file_provider, @cloud_searcher)
 
-      # Global lock
-      @lock = Mutex.new
-
-      # Resource locks
-      @locks = {}
-      @locks_mutex = Mutex.new
-
       # We get disconnected if the connection is inactive for a long period.
       Thread.new do
         while true do
@@ -407,33 +400,7 @@ module VSphereCloud
 
         if replicated_stemcell_vm.nil?
           @logger.info("Cluster doesn't have stemcell #{stemcell}, replicating")
-          lock = nil
-          @locks_mutex.synchronize do
-            lock = @locks[local_stemcell_name]
-            if lock.nil?
-              lock = @locks[local_stemcell_name] = Mutex.new
-            end
-          end
-
-          lock.synchronize do
-            replicated_stemcell_vm = client.find_by_inventory_path(local_stemcell_path)
-            if replicated_stemcell_vm.nil?
-              @logger.info("Replicating #{stemcell} (#{stemcell_vm}) to #{local_stemcell_name}")
-              task = clone_vm(stemcell_vm,
-                              local_stemcell_name,
-                              cluster.datacenter.template_folder.mob,
-                              cluster.resource_pool.mob,
-                              datastore: datastore.mob)
-              replicated_stemcell_vm = client.wait_for_task(task)
-              @logger.info("Replicated #{stemcell} (#{stemcell_vm}) to #{local_stemcell_name} (#{replicated_stemcell_vm})")
-              @logger.info("Creating initial snapshot for linked clones on #{replicated_stemcell_vm}")
-              # Despite the naming, this has nothing to do with the Cloud notion of a disk snapshot
-              # (which comes from AWS). This is a vm snapshot.
-              task = replicated_stemcell_vm.create_snapshot('initial', nil, false, false)
-              client.wait_for_task(task)
-              @logger.info("Created initial snapshot for linked clones on #{replicated_stemcell_vm}")
-            end
-          end
+            replicated_stemcell_vm = replicate_stemcell_helper(stemcell, stemcell_vm, local_stemcell_name, cluster, datastore, replicated_stemcell_vm, local_stemcell_path)
         else
           @logger.info("Found local stemcell replica: #{replicated_stemcell_vm}")
         end
@@ -442,7 +409,6 @@ module VSphereCloud
         @logger.info("Stemcell was already local: #{stemcell_vm}")
         result = stemcell_vm
       end
-
       @logger.info("Using stemcell VM: #{result}")
 
       result
@@ -725,6 +691,40 @@ module VSphereCloud
       placer.nil? ? @resources : placer
     end
 
-    attr_reader :config
+  def replicate_stemcell_helper(stemcell, stemcell_vm, local_stemcell_name, cluster, datastore, replicated_stemcell_vm, local_stemcell_path)
+    @logger.info("Replicating #{stemcell} (#{stemcell_vm}) to #{local_stemcell_name}")
+    task = clone_vm(stemcell_vm,
+                    local_stemcell_name,
+                    cluster.datacenter.template_folder.mob,
+                    cluster.resource_pool.mob,
+                    datastore: datastore.mob)
+    begin
+      replicated_stemcell_vm = client.wait_for_task(task)
+      @logger.info("Replicated #{stemcell} (#{stemcell_vm}) to #{local_stemcell_name} (#{replicated_stemcell_vm})")
+    rescue VSphereCloud::Client::DuplicateName => ex
+      @logger.info("Stemcell is being replicated by another thread, waiting for #{local_stemcell_name} to be ready")
+      replicated_stemcell_vm = client.find_by_inventory_path(local_stemcell_path)
+      # get_properties will ensure the existence of the snapshot by retrying.
+      # This forces us to wait for a valid snapshot before returning with the
+      # replicated stemcell vm, if a snapshot is not found then an exception is thrown.
+      client.cloud_searcher.get_properties(replicated_stemcell_vm,
+                                           VimSdk::Vim::VirtualMachine,
+                                           ['snapshot'], ensure_all: true)
+      @logger.info("Stemcell #{local_stemcell_name} has been replicated.")
+
+      return replicated_stemcell_vm
+    end
+    # Despite the naming, this has nothing to do with the Cloud notion of a disk snapshot
+    # (which comes from AWS). This is a vm snapshot.
+    @logger.info("Creating initial snapshot for linked clones on #{replicated_stemcell_vm}")
+    task = replicated_stemcell_vm.create_snapshot('initial', nil, false, false)
+    client.wait_for_task(task)
+    @logger.info("Created initial snapshot for linked clones on #{replicated_stemcell_vm}")
+
+    replicated_stemcell_vm
+  end
+
+  attr_reader :config
+
   end
 end

data/lib/cloud/vsphere/cloud_searcher.rb

@@ -1,7 +1,11 @@
+require 'common/common'
+
 module VSphereCloud
   class CloudSearcher
     include VimSdk
 
+    class MissingPropertiesException < StandardError; end
+
     PC = Vmodl::Query::PropertyCollector
 
     def initialize(service_content, logger)
@@ -24,9 +28,11 @@ module VSphereCloud
       end
 
       filter_spec = PC::FilterSpec.new(:prop_set => property_specs, :object_set => object_spec)
-
-      attempts = 0
-      begin
+      
+      # Bosh::Common.retryable default has an exponential sleeper,
+      # with 30 tries the timeout will be ~265s
+      errors = [MissingPropertiesException]
+      Bosh::Common.retryable(tries: 30, on: errors) do |tries, error|
         properties_response = get_all_properties(filter_spec)
         result = {}
 
@@ -44,26 +50,15 @@ module VSphereCloud
             end
           end
           unless remaining_properties.empty?
-            raise "The object[s] #{obj.pretty_inspect} " +
+            raise MissingPropertiesException.new("The object[s] #{obj} " +
               "should have the following properties: #{properties.pretty_inspect}, " +
-              "but they were missing these: #{remaining_properties.pretty_inspect}."
+              "but they were missing these: #{remaining_properties.pretty_inspect}.")
           end
           result[object_content.obj] = object_properties
         end
 
         result = result.values.first if obj.is_a?(Vmodl::ManagedObject)
         result
-      rescue => e
-        attempts += 1
-        if attempts < 8
-          sleep_interval = 2 ** attempts
-          @logger.warn("Error retrieving properties, retrying in #{sleep_interval} seconds: " +
-            "#{e} - #{e.backtrace.join("\n")}")
-          sleep(sleep_interval)
-          retry
-        else
-          raise e
-        end
       end
     end
 

data/lib/cloud/vsphere/resources/folder.rb

@@ -16,7 +16,11 @@ module VSphereCloud
       private
 
       def find_or_create_folder(path_components)
-        return root_vm_folder if path_components.empty?
+        if path_components.empty?
+          folder = root_vm_folder
+          raise "Root VM Folder not found: #{@datacenter_name}/vm" if folder.nil?
+          return folder
+        end
 
         folder = find_folder(path_components)
         if folder.nil?

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.3012.0'
+      VERSION = '1.3016.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.3012.0
+  version: 1.3016.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH VSphere CPI
-  8d43aa
+  10557b
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi