tengine_resource 0.5.15 → 1.1.0

data/lib/tengine/resource/server.rb

@@ -24,9 +24,9 @@ class Tengine::Resource::Server
   validates :name, :presence => true, :format => BASE_NAME.options
 
   validates :name, :uniqueness => {:scope => :provider_id}, :if => :need_to_validate_name_uniqueness?
-  index [[:name,  Mongo::ASCENDING], [:provider_id,  Mongo::ASCENDING], ], :unique => true
+  index({ name: 1, provider_id: 1 }, { unique: 1 })
 
-  index([ [:status,  Mongo::ASCENDING], [:_type,  Mongo::ASCENDING], ])
+  index status: 1,  _type: 1
 
   has_many :guest_servers, :class_name => "Tengine::Resource::VirtualServer", :inverse_of => :host_server
 
@@ -34,7 +34,7 @@ class Tengine::Resource::Server
 
   class << self
     def find_or_create_by_name!(attrs = {}, &block)
-      result = Tengine::Resource::Server.first(:conditions => {:name => attrs[:name]})
+      result = Tengine::Resource::Server.where({:name => attrs[:name]}).first
       result ||= self.create!(attrs)
       result
     end

data/lib/tengine/resource/virtual_server.rb

@@ -9,7 +9,7 @@ class Tengine::Resource::VirtualServer < Tengine::Resource::Server
     :class_name => "Tengine::Resource::Provider"
 
   validates_uniqueness_of :provided_id, :scope => :provider_id, :unless => :ignore_provided_id_uniqueness
-  index [[:provided_id,  Mongo::ASCENDING], [:provider_id,  Mongo::ASCENDING], ], :unique => true
+  index({ provided_id: 1, provider_id: 1 }, { unique: true })
 
   ## launch_modeに関する実装
 

data/lib/tengine/resource/virtual_server_image.rb

@@ -15,18 +15,18 @@ class Tengine::Resource::VirtualServerImage
     :class_name => "Tengine::Resource::Provider"
 
   validates :name, :presence => true, :uniqueness => true, :format => BASE_NAME.options
-  index :name, :unique => true
+  index({ name: 1 }, { unique: true })
 
-  index([ [:description, Mongo::ASCENDING], ])
-  index([ [:description, Mongo::DESCENDING], ])
-  index([ [:provided_description, Mongo::ASCENDING], ])
-  index([ [:provided_description, Mongo::DESCENDING], ])
-  index([ [:provided_id, Mongo::ASCENDING], ])
-  index([ [:provided_id, Mongo::DESCENDING], ])
+  index description: 1
+  index description: -1
+  index provided_description: 1
+  index provided_description: -1
+  index provided_id: 1
+  index provided_id: -1
 
   class << self
     def find_or_create_by_name!(attrs = {}, &block)
-      result = self.first(:conditions => {:name => attrs[:name]})
+      result = self.where({:name => attrs[:name]}).first
       result ||= self.create!(attrs)
       result
     end

data/lib/tengine/resource/virtual_server_type.rb

@@ -13,9 +13,9 @@ class Tengine::Resource::VirtualServerType
   field :properties, :type => Hash
   map_yaml_accessor :properties
 
-  referenced_in :provider, :inverse_of => :virtual_server_types, :index => true,
+  belongs_to :provider, :inverse_of => :virtual_server_types, :index => true,
     :class_name => "Tengine::Resource::Provider"
 
   validates :provided_id, :presence => true, :uniqueness => {:scope => :provider_id}
-  index [ [:provider_id, Mongo::ASCENDING] , [:provided_id, Mongo::ASCENDING] ], :unique => true
+  index({provider_id: 1, provided_id: 1}, {unique: true})
 end

data/lib/tengine/resource/watcher.rb

@@ -9,6 +9,9 @@ require 'tengine/core/mongoid_fix'
 
 class Tengine::Resource::Watcher
 
+  class ConfigurationError < StandardError
+  end
+
   attr_reader :config, :pid
 
   def initialize(argv = [])
@@ -76,30 +79,33 @@ class Tengine::Resource::Watcher
     Mongoid.observers = Tengine::Resource::Observer
     Mongoid.instantiate_observers
 
-    Mongoid.config.from_hash(config[:db])
-    Mongoid.config.option(:persist_in_safe_mode, :default => true)
+    Mongoid.configure do |c|
+      c.send :load_configuration, @config[:db]
+    end
 
     EM.run do
       sender.wait_for_connection do
-        providers = Tengine::Resource::Provider.all
+        providers = find_providers
         providers.each do |provider|
-          
           provider.retry_on_error = true if provider.respond_to?(:retry_on_error=)
           # polling_intervalが 0 以下の場合は、問い合わせを行わない
           if (polling_interval = provider.polling_interval) > 0
             # 仮想サーバタイプの監視
-            provider.virtual_server_type_watch
-            mutex = Tengine::Core::Mutex.new "#{provider.name}@#{self.class}", provider.polling_interval
+            provider.synchronize_virtual_server_types
+            name = "#{provider.name}@#{self.class}"
+            # Tengine::Core::Mutexをnameに対して固有のObjectIdを設定します。
+            Tengine::Core::Mutex::Mutex.add_static_bson_objectid(name, provider.id)
+            mutex = Tengine::Core::Mutex.new(name, provider.polling_interval)
             @periodic = EM.add_periodic_timer(provider.polling_interval) do
               mutex.synchronize do
                 # 物理サーバの監視
-                provider.physical_server_watch
+                provider.synchronize_physical_servers
                 mutex.heartbeat
                 # 仮想サーバの監視
-                provider.virtual_server_watch
+                provider.synchronize_virtual_servers
                 mutex.heartbeat
                 # 仮想サーバイメージの監視
-                provider.virtual_server_image_watch
+                provider.synchronize_virtual_server_images
               end
             end
           end
@@ -115,6 +121,30 @@ class Tengine::Resource::Watcher
     end
   end
 
+  def find_providers
+    providers = Tengine::Resource::Provider.all
+    begin
+      result = providers.to_a
+      raise ConfigurationError, "no provider found" if result.empty?
+      return result
+    rescue NameError => e
+      raise e unless e.message =~ /uninitialized constant/
+      documents = Mongoid.default_session.collections.
+        detect{|c| c.name.to_s == Tengine::Resource::Provider.collection_name.to_s}.find
+      types = documents.map{|d| d['_type']}
+      undefined_type_names = types.select do |t|
+        begin
+          t.constantize
+          false
+        rescue Exception
+          true
+        end
+      end
+      raise ConfigurationError, "provider class not found: " << undefined_type_names.join(", ")
+    end
+  end
+
+
   extend Tengine::Core::MethodTraceable
   method_trace(*instance_methods(false))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_resource
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,248 +14,199 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tengine_support
-  requirement: &2167694120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.27
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2167694120
-- !ruby/object:Gem::Dependency
-  name: tengine_core
-  requirement: &2167693400 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.39
-  type: :runtime
-  prerelease: false
-  version_requirements: *2167693400
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: wakame-adapters-tengine
-  requirement: &2167692340 !ruby/object:Gem::Requirement
+  name: tengine_core
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2167692340
-- !ruby/object:Gem::Dependency
-  name: right_aws
-  requirement: &2167691640 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *2167691640
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &2167688000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *2167688000
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2167687400 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.5.2
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2167687400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: &2167686720 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2167686720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &2167686100 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *2167686100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2167685440 !ruby/object:Gem::Requirement
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 0.8.1
   type: :development
   prerelease: false
-  version_requirements: *2167685440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2167684560 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *2167684560
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &2167683460 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.4
+- !ruby/object:Gem::Dependency
+  name: autotest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2167683460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ZenTest
-  requirement: &2167682360 !ruby/object:Gem::Requirement
+  name: rdiscount
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.6.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2167682360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: tengine_resource provides physical/virtual server management
 email: tengine-info@groovenauts.jp
 executables:
 - tengine_resource_watchd
+- create_indexes_for_tengine_resource
 extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .document
-- .rspec
 - Gemfile
 - Gemfile.lock
 - README.rdoc
-- Rakefile
-- VERSION
+- bin/create_indexes_for_tengine_resource
 - bin/tengine_resource_watchd
-- config/.gitignore
 - config/watchd.yml.erb.example
-- lib/tengine/resource.rb
-- lib/tengine/resource/config.rb
 - lib/tengine/resource/config/resource.rb
+- lib/tengine/resource/config.rb
 - lib/tengine/resource/credential.rb
-- lib/tengine/resource/credential/ec2.rb
-- lib/tengine/resource/credential/ec2/dummy.rb
-- lib/tengine/resource/credential/ec2/launch_options.rb
 - lib/tengine/resource/drivers/resource_control_driver.rb
 - lib/tengine/resource/net_ssh.rb
 - lib/tengine/resource/observer.rb
 - lib/tengine/resource/physical_server.rb
 - lib/tengine/resource/provider.rb
-- lib/tengine/resource/provider/ec2.rb
-- lib/tengine/resource/provider/wakame.rb
 - lib/tengine/resource/server.rb
 - lib/tengine/resource/virtual_server.rb
 - lib/tengine/resource/virtual_server_image.rb
 - lib/tengine/resource/virtual_server_type.rb
 - lib/tengine/resource/watcher.rb
+- lib/tengine/resource.rb
 - lib/tengine_resource.rb
-- spec/fixtures/goku_at_ec2_ap_northeast.rb
-- spec/mongoid.yml
-- spec/mongoid_en.yml
-- spec/spec_helper.rb
-- spec/support/ec2.rb
-- spec/support/mongo_index_key_log.rb
-- spec/tengine/resource/bugfix/watcher_for_wakame_spec.rb
-- spec/tengine/resource/credential_spec.rb
-- spec/tengine/resource/drivers/resource_control_driver_spec.rb
-- spec/tengine/resource/net_ssh_spec.rb
-- spec/tengine/resource/physical_server_spec.rb
-- spec/tengine/resource/provider/ec2_spec.rb
-- spec/tengine/resource/provider/test_files/describe_host_nodes.json
-- spec/tengine/resource/provider/test_files/describe_images.json
-- spec/tengine/resource/provider/test_files/describe_instance_specs.json
-- spec/tengine/resource/provider/test_files/describe_instances.json
-- spec/tengine/resource/provider/test_files/run_instances.json
-- spec/tengine/resource/provider/test_files/terminate_instances.json
-- spec/tengine/resource/provider/wakame/00_describe_host_nodes_0_physical_servers.json
-- spec/tengine/resource/provider/wakame/01_describe_host_nodes_10_physical_servers.json
-- spec/tengine/resource/provider/wakame/02_describe_host_nodes_60_physical_servers.json
-- spec/tengine/resource/provider/wakame/10_describe_instances_0_virtual_servers.json
-- spec/tengine/resource/provider/wakame/11_describe_instances_10_virtual_servers.json
-- spec/tengine/resource/provider/wakame/12_describe_instances_after_run_instances.json
-- spec/tengine/resource/provider/wakame/13_describe_instances_after_terminate_instances.json
-- spec/tengine/resource/provider/wakame/20_describe_images_0_virtual_server_images.json
-- spec/tengine/resource/provider/wakame/21_describe_images_5_virtual_server_images.json
-- spec/tengine/resource/provider/wakame/22_describe_images_60_virtual_server_images.json
-- spec/tengine/resource/provider/wakame/30_describe_instance_specs_0_virtual_server_specs.json
-- spec/tengine/resource/provider/wakame/31_describe_instance_specs_4_virtual_server_specs.json
-- spec/tengine/resource/provider/wakame/40_run_instances_0_virtual_servers.json
-- spec/tengine/resource/provider/wakame/41_run_instances_1_virtual_servers.json
-- spec/tengine/resource/provider/wakame/42_run_instances_5_virtual_servers.json
-- spec/tengine/resource/provider/wakame/50_terminate_instances_0_virtual_servers.json
-- spec/tengine/resource/provider/wakame/51_terminate_instances_3_virtual_servers.json
-- spec/tengine/resource/provider/wakame/sync_physical_servers_spec.rb
-- spec/tengine/resource/provider/wakame/sync_virtual_server_images_spec.rb
-- spec/tengine/resource/provider/wakame/sync_virtual_server_types_spec.rb
-- spec/tengine/resource/provider/wakame/sync_virtual_servers_spec.rb
-- spec/tengine/resource/provider/wakame_api_spec.rb
-- spec/tengine/resource/provider/wakame_spec.rb
-- spec/tengine/resource/provider_spec.rb
-- spec/tengine/resource/server_spec.rb
-- spec/tengine/resource/test_files/.gitignore
-- spec/tengine/resource/test_files/00_describe_host_nodes_0_physical_servers.json
-- spec/tengine/resource/test_files/01_describe_host_nodes_10_physical_servers.json
-- spec/tengine/resource/test_files/02_describe_host_nodes_60_physical_servers.json
-- spec/tengine/resource/test_files/10_describe_instances_0_virtual_servers.json
-- spec/tengine/resource/test_files/11_describe_instances_10_virtual_servers.json
-- spec/tengine/resource/test_files/12_describe_instances_after_run_instances.json
-- spec/tengine/resource/test_files/13_describe_instances_after_terminate_instances.json
-- spec/tengine/resource/test_files/14_describe_instances_after_run_1_instance.json
-- spec/tengine/resource/test_files/20_describe_images_0_virtual_server_images.json
-- spec/tengine/resource/test_files/21_describe_images_5_virtual_server_images.json
-- spec/tengine/resource/test_files/22_describe_images_60_virtual_server_images.json
-- spec/tengine/resource/test_files/30_describe_instance_specs_0_virtual_server_specs.json
-- spec/tengine/resource/test_files/31_describe_instance_specs_4_virtual_server_specs.json
-- spec/tengine/resource/test_files/40_run_instances_0_virtual_servers.json
-- spec/tengine/resource/test_files/41_run_instances_1_virtual_servers.json
-- spec/tengine/resource/test_files/42_run_instances_5_virtual_servers.json
-- spec/tengine/resource/test_files/43_run_instances_1_virtual_servers_without_aws_availability_zone.json
-- spec/tengine/resource/test_files/50_terminate_instances_0_virtual_servers.json
-- spec/tengine/resource/test_files/51_terminate_instances_3_virtual_servers.json
-- spec/tengine/resource/virtual_server_image_spec.rb
-- spec/tengine/resource/virtual_server_spec.rb
-- spec/tengine/resource/virtual_server_type_spec.rb
-- spec/tengine/resource/watcher_spec.rb
-- spec/tengine_resource_spec.rb
-- tengine_resource.gemspec
-- tmp/log/.gitignore
+- tmp/.gitkeep
 homepage: http://github.com/tengine/tengine_resource
 licenses:
 - MPL2.0/LGPLv3
@@ -271,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1726156780355698664
+      hash: 3643853348357995462
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -280,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: tengine_resource provides physical/virtual server management