bosh_vsphere_cpi 1.2922.0 → 1.2941.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9da3f8c17e6bd57363d2eedc21248eb9d08d2352
-  data.tar.gz: 66d5e838dc31ef2351fa4df80cc1398639103c1b
+  metadata.gz: c170ec260d3cfe333240d18e22e6e29d9556dece
+  data.tar.gz: 1657d5501ba4ccaf32cac849af21498060cb544e
 SHA512:
-  metadata.gz: 83e9d2ddbba50a2d99d24336103ffbdeef15d567583dc9fdcdfa1380dfad45a199f78b6863665dc1b00723b34f6526854b9065c9932b6a601c30218590b4032a
-  data.tar.gz: 3ebad30138adeae37b647f6ab25ed20f4653cef109d230f9d4a9bd9bda0b58c6cec2087cf76fde46e2de259cb6f8cdaecd2ed73ebce4466edc61dfe8cb1396d8
+  metadata.gz: fe8cc464b57fefe3be2c60b6d47b9165129f635a3f0d6b5d71eb2e52474cea84fc05a522af8a0ddcfff3e0c1589371be602645433ea99878d331d15eb885a550
+  data.tar.gz: ed36e5442ed70f0bda060c85c791ba44e3ee2f30445c3a0be05c60cf8825c1400f83f4058889669759a11290ffb582d05ff616f7644f33c8d022e74e5de5cbe0

data/lib/cloud/vsphere/disk_provider.rb

@@ -13,7 +13,7 @@ module VSphereCloud
     end
 
     def create(disk_size_in_mb)
-      datastore = find_datastore(disk_size_in_mb)
+      datastore = @datacenter.pick_persistent_datastore(disk_size_in_mb)
       disk_cid = "disk-#{SecureRandom.uuid}"
       @logger.debug("Creating disk '#{disk_cid}' in datastore '#{datastore.name}'")
 
@@ -24,7 +24,7 @@ module VSphereCloud
       disk = find(disk_cid)
       return disk if accessible_datastores.include?(disk.datastore.name)
 
-      destination_datastore =  @resources.pick_persistent_datastore_in_cluster(cluster, disk.size_in_mb)
+      destination_datastore = @resources.pick_persistent_datastore_in_cluster(cluster, disk.size_in_mb)
 
       unless accessible_datastores.include?(destination_datastore.name)
         raise "Datastore '#{destination_datastore.name}' is not accessible to cluster '#{cluster.name}'"
@@ -51,16 +51,5 @@ module VSphereCloud
     def path(datastore, disk_cid)
       "[#{datastore.name}] #{@disk_path}/#{disk_cid}.vmdk"
     end
-
-    def find_datastore(disk_size_in_mb)
-      datastore = @datacenter.pick_persistent_datastore(disk_size_in_mb)
-
-      if datastore.nil?
-        raise Bosh::Clouds::NoDiskSpace.new(true),
-          "Not enough persistent space #{disk_size_in_mb}"
-      end
-
-      datastore
-    end
   end
 end

data/lib/cloud/vsphere/fixed_cluster_placer.rb

@@ -14,12 +14,6 @@ module VSphereCloud
 
     def pick_ephemeral_datastore(cluster, disk_size_in_mb)
       datastore = cluster.pick_ephemeral(disk_size_in_mb)
-
-      if datastore.nil?
-        raise Bosh::Clouds::NoDiskSpace.new(
-          "Not enough ephemeral disk space (#{disk_size_in_mb}MB) in cluster #{cluster.name}")
-      end
-
       datastore.allocate(disk_size_in_mb)
       datastore
     end

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

@@ -81,8 +81,8 @@ module VSphereCloud
       # Picks the best datastore for the specified persistent disk.
       #
       # @param [Integer] size persistent disk size.
-      # @return [Datastore, nil] best datastore if available for the requested
-      #   size.
+      # @return [Datastore] the best datastore for the requested size.
+      # @raise [Bosh::Clouds::NoDiskSpace] if no datastore available for the requested size
       def pick_persistent(size)
         pick_store(:persistent, size)
       end
@@ -90,8 +90,8 @@ module VSphereCloud
       # Picks the best datastore for the specified ephemeral disk.
       #
       # @param [Integer] size ephemeral disk size.
-      # @return [Datastore, nil] best datastore if available for the requested
-      #   size.
+      # @return [Datastore] the best datastore for the requested size.
+      # @raise [Bosh::Clouds::NoDiskSpace] if no datastore available for the requested size
       def pick_ephemeral(size)
         pick_store(:ephemeral, size)
       end
@@ -124,58 +124,20 @@ module VSphereCloud
         matching_datastores.inject({}) { |h, datastore| h[datastore.name] = datastore; h }
       end
 
-      # Picks the best datastore for the specified disk size and type.
-      #
-      # First the exclusive datastore pool is used. If it's empty or doesn't
-      # have enough capacity then the shared pool will be used.
-      #
-      # @param [Integer] size disk size.
-      # @param [Symbol] type disk type.
-      # @return [Datastore, nil] best datastore if available for the requested
-      #   size.
-
       def pick_store(type, size)
-        datastores = type == :ephemeral ? ephemeral_datastores : persistent_datastores
-        datastores_and_free_space = datastores.each_value.map do |datastore|
-          [datastore, datastore.free_space]
-        end
-
-        datastores_and_free_space_with_enough_space = datastores_and_free_space.reject do |datastore, free_space|
-          free_space - size < DISK_HEADROOM
-        end
-
-        log_datastore_selection(type, datastores_and_free_space, datastores_and_free_space_with_enough_space, size)
+        datastores = (type == :ephemeral ? ephemeral_datastores : persistent_datastores).values
+        available_datastores = datastores.reject { |datastore| datastore.free_space - size < DISK_HEADROOM }
 
-        if datastores_and_free_space_with_enough_space.empty?
-          raise_no_disk_space_found(type, datastores_and_free_space, size)
-        end
+        @logger.debug("Looking for a #{type} datastore in #{self.name} with #{size}MB free space.")
+        @logger.debug("All datastores: #{datastores.map(&:debug_info)}")
+        @logger.debug("Datastores with enough space: #{available_datastores.map(&:debug_info)}")
 
-        Util.weighted_random(datastores_and_free_space_with_enough_space)
-      end
+        selected_datastore = Util.weighted_random(available_datastores.map { |datastore| [datastore, datastore.free_space] })
 
-      def raise_no_disk_space_found(type, datastores_and_free_space, size)
-        datastore_debug_info = datastores_and_free_space.map do |datastore, free_space|
-          "#{datastore.name} (#{free_space}MB free of #{datastore.total_space}MB capacity)"
+        if selected_datastore.nil?
+          raise Bosh::Clouds::NoDiskSpace.new(true), "Couldn't find a #{type} datastore with #{size}MB of free space accessible from cluster '#{self.name}'. Found:\n #{datastores.map(&:debug_info).join("\n ")}\n"
         end
-        raise Bosh::Clouds::NoDiskSpace.new(true), <<-MESSAGE
-Couldn't find a #{type} datastore with #{size}MB of free space in #{name}. Found:
- #{datastore_debug_info.join("\n ")}
-        MESSAGE
-      end
-
-      def log_datastore_selection(type, datastores_and_free_space, datastores_and_free_space_with_enough_space, size)
-        @logger.debug("Looking for a #{type} datastore in #{name} with #{size}MB free space in:")
-        datastores_and_free_space.each do |datastore, _|
-          @logger.debug(" #{debug_info_for_datastore(datastore)}")
-        end
-        acceptable_datastores_message = datastores_and_free_space_with_enough_space.map do |datastore, _|
-          datastore.name
-        end.join(", ")
-        @logger.debug("Picking a random datastore (weighted by free space) from: #{acceptable_datastores_message}")
-      end
-
-      def debug_info_for_datastore(datastore)
-        "#{datastore.name} (#{datastore.free_space}MB free of #{datastore.total_space}MB capacity)"
+        selected_datastore
       end
 
       def synced_free_memory

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

@@ -64,11 +64,12 @@ module VSphereCloud
       end
 
       def clusters
-        cluster_mobs = Hash[*cluster_tuples.flatten]
+        cluster_mobs = get_cluster_mobs
 
         clusters_properties = @client.cloud_searcher.get_properties(
           cluster_mobs.values, Vim::ClusterComputeResource,
-          Cluster::PROPERTIES, :ensure_all => true)
+          Cluster::PROPERTIES, :ensure_all => true
+        )
 
         clusters = {}
         @clusters.each do |cluster_name, cluster_config|
@@ -94,24 +95,38 @@ module VSphereCloud
         datastores
       end
 
-      def pick_persistent_datastore(disk_size_in_mb)
+      def pick_persistent_datastore(size)
         weighted_datastores = []
         persistent_datastores.each_value do |datastore|
-          if datastore.free_space - disk_size_in_mb >= DISK_HEADROOM
+          if datastore.free_space - size >= DISK_HEADROOM
             weighted_datastores << [datastore, datastore.free_space]
           end
         end
 
-        Util.weighted_random(weighted_datastores)
+        type = :persistent
+        datastores = persistent_datastores.values
+        available_datastores = datastores.reject { |datastore| datastore.free_space - size < DISK_HEADROOM }
+
+        @logger.debug("Looking for a #{type} datastore with #{size}MB free space.")
+        @logger.debug("All datastores: #{datastores.map(&:debug_info)}")
+        @logger.debug("Datastores with enough space: #{available_datastores.map(&:debug_info)}")
+
+        selected_datastore = Util.weighted_random(available_datastores.map { |datastore| [datastore, datastore.free_space] })
+
+        if selected_datastore.nil?
+          raise Bosh::Clouds::NoDiskSpace.new(true), "Couldn't find a #{type} datastore with #{size}MB of free space. Found:\n #{datastores.map(&:debug_info).join("\n ")}\n"
+        end
+        selected_datastore
       end
 
       private
 
-      def cluster_tuples
+      def get_cluster_mobs
         cluster_tuples = @client.cloud_searcher.get_managed_objects(
-          Vim::ClusterComputeResource, root: mob, include_name: true)
-        cluster_tuples.delete_if { |name, _| !@clusters.has_key?(name) }
-        cluster_tuples
+          Vim::ClusterComputeResource, root: mob, include_name: true
+        )
+        non_clusters = cluster_tuples.reject { |name, _| !@clusters.has_key?(name) }
+        Hash[*(non_clusters.flatten)]
       end
     end
   end

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

@@ -67,6 +67,10 @@ module VSphereCloud
       def inspect
         "<Datastore: #@mob / #@name>"
       end
+
+      def debug_info
+        "#{name} (#{free_space}MB free of #{total_space}MB capacity)"
+      end
     end
   end
 end

data/lib/cloud/vsphere/resources.rb

@@ -28,7 +28,7 @@ module VSphereCloud
       @lock.synchronize do
         cluster = @datacenter.clusters[cluster_name]
         if cluster.nil?
-          raise Bosh::Clouds::NoDiskSpace.new(true), "Couldn't find cluster '#{cluster_name}'. Found #{@datacenter.clusters.values.map(&:name).join(", ")}"
+          raise Bosh::Clouds::CloudError, "Couldn't find cluster '#{cluster_name}'. Found #{@datacenter.clusters.values.map(&:name)}"
         end
 
         datastore = cluster.pick_persistent(disk_size_in_mb)
@@ -107,11 +107,6 @@ module VSphereCloud
     def pick_ephemeral_datastore(cluster, disk_size_in_mb)
       @lock.synchronize do
         datastore = cluster.pick_ephemeral(disk_size_in_mb)
-        if datastore.nil?
-          raise Bosh::Clouds::NoDiskSpace.new(
-              "Not enough ephemeral disk space (#{disk_size_in_mb}MB) in cluster #{cluster.name}")
-        end
-
         datastore.allocate(disk_size_in_mb)
         datastore
       end

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2922.0'
+      VERSION = '1.2941.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2922.0
+  version: 1.2941.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-21 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.2922.0
+        version: 1.2941.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2922.0
+        version: 1.2941.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2922.0
+        version: 1.2941.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2922.0
+        version: 1.2941.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH VSphere CPI
-  3778c5
+  8ac133
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi