bosh_vsphere_cpi 1.2902.0 → 1.2905.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8476afad7bad1192d764778265348d8a31ec60d9
-  data.tar.gz: ad2c4d1f695e444660d4e765db47a3c0f7f89b7c
+  metadata.gz: 60c75ba55eeb149c55f82d2e0761aa6c99b0f142
+  data.tar.gz: 9b5dff6edbb35ea496be586e0d2007b24a4b933f
 SHA512:
-  metadata.gz: 3409e451fde5a32cdaa22e092abe8211046207ebc2f35bfdfae60b667a2999bc6aa1d8329dfb2a72595459796afcf1c8a10bfc7690d1b68da81a17538a31cdfd
-  data.tar.gz: 79ff48d380c07d508b12ab1935a0f873d6eafa2f46eacd0a7592817efd9fb00351ebbf8642865a64dc43760d4dd3508e59760c17553161a51953c197b7805a7b
+  metadata.gz: a69456ce29e6c0a9080b1a3269bd15c3c7c015d0960bd93d2f2dd6965c998762420bbeed3d3d39875b937680deaf37d72a767b0545296f0706aa58cb4a6d78ba
+  data.tar.gz: a118414527e88a772f5b6697b15a40cde2f13c293cd316e47e8e61e59413ff80b82100de85f244a76e76db8cafcc11516d70fdff51bbd6b2c55d8d1882b0b0c4

data/lib/cloud/vsphere/disk_provider.rb

@@ -25,10 +25,6 @@ module VSphereCloud
       return disk if accessible_datastores.include?(disk.datastore.name)
 
       destination_datastore =  @resources.pick_persistent_datastore_in_cluster(cluster, disk.size_in_mb)
-      if destination_datastore.nil?
-        raise Bosh::Clouds::NoDiskSpace.new(true),
-          "Not enough persistent space on cluster '#{cluster.name}', requested disk size: #{disk.size_in_mb}Mb"
-      end
 
       unless accessible_datastores.include?(destination_datastore.name)
         raise "Datastore '#{destination_datastore.name}' is not accessible to cluster '#{cluster.name}'"

data/lib/cloud/vsphere/resources.rb

@@ -27,9 +27,13 @@ module VSphereCloud
     def pick_persistent_datastore_in_cluster(cluster_name, disk_size_in_mb)
       @lock.synchronize do
         cluster = @datacenter.clusters[cluster_name]
-        return nil if cluster.nil?
+        if cluster.nil?
+          raise Bosh::Clouds::NoDiskSpace.new(true), "Couldn't find cluster '#{cluster_name}'. Found #{@datacenter.clusters.values.map(&:name).join(", ")}"
+        end
 
-        pick_datastore(cluster, disk_size_in_mb)
+        datastore = cluster.pick_persistent(disk_size_in_mb)
+        datastore.allocate(disk_size_in_mb)
+        datastore
       end
     end
 
@@ -116,11 +120,6 @@ module VSphereCloud
     def pick_persistent_datastore(cluster, disk_size_in_mb)
       @lock.synchronize do
         datastore = cluster.pick_persistent(disk_size_in_mb)
-        if datastore.nil?
-          raise Bosh::Clouds::NoDiskSpace.new(
-              "Not enough persistent disk space (#{disk_size_in_mb}MB) in cluster #{cluster.name}")
-        end
-
         datastore.allocate(disk_size_in_mb)
         datastore
       end
@@ -130,12 +129,6 @@ module VSphereCloud
 
     attr_reader :config
 
-    def pick_datastore(cluster, disk_space)
-      datastore = cluster.pick_persistent(disk_space)
-      return nil if datastore.nil?
-      datastore.allocate(disk_space)
-      datastore
-    end
 
     class PersistentDiskIndex
       def initialize(clusters, existing_persistent_disks)

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

@@ -84,7 +84,7 @@ module VSphereCloud
       # @return [Datastore, nil] best datastore if available for the requested
       #   size.
       def pick_persistent(size)
-        pick_store(size, :persistent)
+        pick_store(:persistent, size)
       end
 
       # Picks the best datastore for the specified ephemeral disk.
@@ -93,7 +93,7 @@ module VSphereCloud
       # @return [Datastore, nil] best datastore if available for the requested
       #   size.
       def pick_ephemeral(size)
-        pick_store(size, :ephemeral)
+        pick_store(:ephemeral, size)
       end
 
       # @return [String] cluster name.
@@ -133,17 +133,49 @@ module VSphereCloud
       # @param [Symbol] type disk type.
       # @return [Datastore, nil] best datastore if available for the requested
       #   size.
-      def pick_store(size, type)
-        weighted_datastores = []
-        datastores =
-          type == :persistent ? persistent_datastores : ephemeral_datastores
-        datastores.each_value do |datastore|
-          if datastore.free_space - size >= DISK_HEADROOM
-            weighted_datastores << [datastore, datastore.free_space]
-          end
+
+      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)
+
+        if datastores_and_free_space_with_enough_space.empty?
+          raise_no_disk_space_found(type, datastores_and_free_space, size)
+        end
+
+        Util.weighted_random(datastores_and_free_space_with_enough_space)
+      end
+
+      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)"
         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
 
-        Util.weighted_random(weighted_datastores)
+      def debug_info_for_datastore(datastore)
+        "#{datastore.name} (#{datastore.free_space}MB free of #{datastore.total_space}MB capacity)"
       end
 
       def synced_free_memory

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2902.0'
+      VERSION = '1.2905.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2902.0
+  version: 1.2905.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-27 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.2902.0
+        version: 1.2905.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2902.0
+        version: 1.2905.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2902.0
+        version: 1.2905.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2902.0
+        version: 1.2905.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH VSphere CPI
-  ac0a41
+  327a58
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi