bosh-director 1.1782.0 → 1.1798.0

data/db/migrations/director/20140116002324_pivot_director_attributes.rb

@@ -0,0 +1,20 @@
+Sequel.migration do
+  change do
+    rename_table(:director_attributes, :old_director_attributes)
+
+    create_table(:director_attributes) do
+      primary_key :name
+      String :name, unique: true, null: false
+      String :value
+    end
+
+    # Some directors might have created multiple records.
+    # Only the first record is ever used after every director restart.
+    old_attribute = self[:old_director_attributes].first
+    if old_attribute
+      self[:director_attributes].insert(name: 'uuid', value: old_attribute[:uuid])
+    end
+
+    drop_table(:old_director_attributes)
+  end
+end

data/lib/bosh/director/config.rb

@@ -118,7 +118,7 @@ module Bosh::Director
           @dns_domain_name = canonical(@dns["domain_name"]) if @dns["domain_name"]
         end
 
-        @uuid = override_uuid || retrieve_uuid
+        @uuid = override_uuid || Bosh::Director::Models::DirectorAttribute.find_or_create_uuid(@logger)
         @logger.info("Director UUID: #{@uuid}")
 
         @encryption = config["encryption"]
@@ -292,46 +292,27 @@ module Bosh::Director
         end
       end
 
-      def retrieve_uuid
-        directors = Bosh::Director::Models::DirectorAttribute.all
-        director = directors.first
-
-        if directors.size > 1
-          @logger.warn("More than one UUID stored in director table, using #{director.uuid}")
-        end
-
-        unless director
-          director = Bosh::Director::Models::DirectorAttribute.new
-          director.uuid = gen_uuid
-          director.save
-          @logger.info("Generated director UUID #{director.uuid}")
-        end
-
-        director.uuid
-      end
-
       def override_uuid
         new_uuid = nil
+        state_file = File.join(base_dir, 'state.json')
 
         if File.exists?(state_file)
           open(state_file, 'r+') do |file|
 
-            # lock before read to avoid director/worker race condition
+            # Lock before read to avoid director/worker race condition
             file.flock(File::LOCK_EX)
             state = Yajl::Parser.parse(file) || {}
-            # empty state file to prevent blocked processes from attempting to set UUID
+
+            # Empty state file to prevent blocked processes from attempting to set UUID
             file.truncate(0)
 
-            if state["uuid"]
-              Bosh::Director::Models::DirectorAttribute.delete
-              director = Bosh::Director::Models::DirectorAttribute.new
-              director.uuid = state["uuid"]
-              director.save
-              @logger.info("Using director UUID #{state["uuid"]} from #{state_file}")
-              new_uuid = state["uuid"]
+            if state['uuid']
+              Bosh::Director::Models::DirectorAttribute.update_or_create_uuid(state['uuid'], @logger)
+              @logger.info("Using director UUID #{state['uuid']} from #{state_file}")
+              new_uuid = state['uuid']
             end
 
-            # unlock after storing UUID
+            # Unlock after storing UUID
             file.flock(File::LOCK_UN)
           end
 
@@ -340,21 +321,13 @@ module Bosh::Director
 
         new_uuid
       end
-
-      def state_file
-        File.join(base_dir, "state.json")
-      end
-
-      def gen_uuid
-        SecureRandom.uuid
-      end
-
     end
 
     class << self
       def load_file(path)
         Config.new(Psych.load_file(path))
       end
+
       def load_hash(hash)
         Config.new(hash)
       end

data/lib/bosh/director/deployment_plan/job.rb

@@ -204,18 +204,22 @@ module Bosh::Director
       end
 
       def validate_package_names_do_not_collide!
-        releases_by_package_names = templates.reduce([]) { |memo, t|
-          memo + t.model.package_names.product([t.release])
-        }.reduce({}) { |memo, package_name_and_release_version|
-          package_name = package_name_and_release_version.first
-          release_version = package_name_and_release_version.last
-          memo[package_name] ||= Set.new
-          memo[package_name] << release_version
-          memo
-        }
+        releases_by_package_names = templates
+          .reduce([]) { |memo, t| memo + t.model.package_names.product([t.release]) }
+          .reduce({}) { |memo, package_name_and_release_version|
+            package_name = package_name_and_release_version.first
+            release_version = package_name_and_release_version.last
+            memo[package_name] ||= Set.new
+            memo[package_name] << release_version
+            memo
+          }
 
-        if releases_by_package_names.values.detect { |x| x.size > 1 }
-          raise JobPackageCollision, 'Unable to deploy: package name collision in job definitions.'
+        releases_by_package_names.each do |package_name, releases|
+          if releases.size > 1
+            raise JobPackageCollision,
+                  "Colocated package `#{package_name}' has the same name in multiple releases. " +
+                  'BOSH cannot currently colocate two packages with identical names from separate releases.'
+          end
         end
       end
 

data/lib/bosh/director/deployment_plan/job_spec_parser.rb

@@ -87,6 +87,7 @@ module Bosh::Director
             release_name = safe_property(template, 'release', class: String, optional: true)
 
             release = nil
+
             if release_name
               release = @deployment.release(release_name)
               unless release
@@ -99,15 +100,20 @@ module Bosh::Director
                 raise JobMissingRelease, "Cannot tell what release template `#{template_name}' (job `#{@job.name}') is supposed to use, please explicitly specify one"
               end
             end
+
             @job.templates << release.use_template_named(template_name)
           end
         end
       end
 
       def check_template_uniqueness
-        if @job.templates.uniq(&:name).size != @job.templates.size
-          raise JobInvalidTemplates,
-                "Job `#{@job.name}' templates must not have repeating names."
+        all_names = @job.templates.map(&:name)
+        @job.templates.each do |template|
+          if all_names.count(template.name) > 1
+            raise JobInvalidTemplates,
+                  "Colocated job template `#{template.name}' has the same name in multiple releases. " +
+                  "BOSH cannot currently colocate two job templates with identical names from separate releases."
+          end
         end
       end
 

data/lib/bosh/director/models/director_attribute.rb

@@ -1,9 +1,39 @@
 module Bosh::Director::Models
   class DirectorAttribute < Sequel::Model(Bosh::Director::Config.db)
-
     def validate
-      validates_unique [:uuid]
+      validates_presence :name
+    end
+
+    def self.find_or_create_uuid(logger)
+      uuid = first(name: 'uuid')
+      if uuid
+        logger.info("Found uuid director attribute with value=#{uuid.value.inspect}")
+        return uuid.value
+      end
+
+      begin
+        uuid = create(name: 'uuid', value: SecureRandom.uuid)
+        logger.info("Created uuid director attribute with value=#{uuid.value.inspect}")
+        uuid.value
+      rescue Sequel::DatabaseError => e
+        # Database will throw an error in case of race condition
+        # causing multiple uuid records being inserted
+        logger.info("Failed to create uuid director attribute e=#{e.inspect}\n#{e.backtrace}")
+
+        uuid = first(name: 'uuid')
+        logger.info("Found uuid director attribute with value=#{uuid.value.inspect}")
+        uuid.value
+      end
     end
 
+    def self.update_or_create_uuid(value, logger)
+      if where(name: 'uuid').update(value: value) == 0
+        create(name: 'uuid', value: value)
+        logger.info("Created uuid director attribute with value=#{value.inspect}")
+      else
+        logger.info("Updated uuid director attribute with value=#{value.inspect}")
+      end
+      value
+    end
   end
 end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.1782.0'
+    VERSION = '1.1798.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.1782.0
+  version: 1.1798.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1782.0
+        version: 1.1798.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1782.0
+        version: 1.1798.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1782.0
+        version: 1.1798.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1782.0
+        version: 1.1798.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1782.0
+        version: 1.1798.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1782.0
+        version: 1.1798.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1782.0
+        version: 1.1798.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1782.0
+        version: 1.1798.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1782.0
+        version: 1.1798.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1782.0
+        version: 1.1798.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1782.0
+        version: 1.1798.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1782.0
+        version: 1.1798.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1782.0
+        version: 1.1798.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1782.0
+        version: 1.1798.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -461,7 +461,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  5aedfc'
+  4c516b'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -501,6 +501,7 @@ files:
 - db/migrations/director/20130531172604_add_director_attributes.rb
 - db/migrations/director/20131121182231_add_rendered_templates_archives.rb
 - db/migrations/director/20131125232201_rename_rendered_templates_archives_blob_id_and_checksum_columns.rb
+- db/migrations/director/20140116002324_pivot_director_attributes.rb
 - db/migrations/dns/20120123234908_initial.rb
 - lib/bosh/director.rb
 - lib/bosh/director/agent_client.rb
@@ -713,7 +714,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4571235917096416855
+      hash: -1547539602198935562
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23