wakame-vdc-agents 11.06.0 → 11.12.0

data/lib/dcmgr/helpers/cli_helper.rb

@@ -16,9 +16,13 @@ module Dcmgr
 
         timersig = EventMachine.add_timer(opts[:timeout]) {
           timedout = true
-          if curthread
+          if curthread && curthread.alive?
             curthread.raise(TimeoutError.new("timeout"))
-            curthread.pass
+            begin
+              curthread.pass
+            rescue ::Exception => e
+              # any thread errors can be ignored.
+            end
           end
         }
 
@@ -35,7 +39,6 @@ module Dcmgr
           end
           retry if (count -= 1) >= 0
         ensure
-          curthread = nil
           EventMachine.cancel_timer(timersig) rescue nil
         end
       end

data/lib/dcmgr/helpers/ec2_metadata_helper.rb

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+module Dcmgr
+  module Helpers
+    module Ec2MetadataHelper
+      
+    end
+  end
+end

data/lib/dcmgr/helpers/nic_helper.rb

@@ -20,6 +20,17 @@ module Dcmgr
           File.readlines(operstate_path).first.strip
         end
       end
+      
+      # This method cleans up ugly mac addressed stored in the dcmgr database.
+      # Mac addresses in the database are stored as alphanumeric strings without
+      # the : inbetween them. This method properly puts those in there.
+      def clean_mac(mac,delim = ':')
+        mac.unpack('A2'*6).join(delim)
+      end
+
+      def is_natted?(vnic_map)
+        not vnic_map[:ipv4][:nat_address].nil?
+      end
 
       def valid_nic?(nic)
         ifindex_path = "/sys/class/net/#{nic}/ifindex"

data/lib/dcmgr/helpers/snapshot_storage_helper.rb

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+require 'rexml/document'
+
+module Dcmgr
+  module Helpers
+    module SnapshotStorageHelper
+      
+      def key(filename)
+        File.join(@account_id, filename)
+      end
+
+      def execute(cmd, args)
+        script_root_path = File.join(File.expand_path('../../../../',__FILE__), 'script')
+        script = File.join(script_root_path, 'storage_service')
+        cmd = "/usr/bin/env #{@env.join(' ')} %s " + cmd 
+        args = [script] + args
+        res = sh(cmd, args)
+      
+        if res[:stdout] != ''
+          doc = REXML::Document.new res[:stdout]
+          code = REXML::XPath.match( doc, "//Error/Code/text()" ).to_s
+          message = REXML::XPath.match( doc, "//Error/Message/text()" ).to_s
+          bucket_name = REXML::XPath.match( doc, "//Error/BucketName/text()" ).to_s
+          request_id = REXML::XPath.match( doc, "//Error/RequestId/text()" ).to_s
+          host_id = REXML::XPath.match( doc, "//Error/HostId/text()" ).to_s
+          error_message = ["Snapshot execute error: ",cmd, code, message, bucket_name, request_id, host_id].join(',')
+          raise error_message
+        else
+          res 
+        end 
+      end
+    end
+  end
+end

data/lib/dcmgr/models/account.rb

@@ -9,12 +9,6 @@ module Dcmgr::Models
     DISABLED=0
     ENABLED=1
     
-    inheritable_schema do
-      String :description, :size=>100
-      Fixnum :enabled, :default=>ENABLED, :null=>false
-    end
-    with_timestamps
-
     one_to_many  :tags, :dataset=>lambda { Tag.filter(:account_id=>self.canonical_uuid); }
     one_to_one :quota, :class=>Quota, :key=>:account_id
 

data/lib/dcmgr/models/account_resource.rb

@@ -4,10 +4,6 @@ module Dcmgr::Models
   # Base class for the model class which belongs to a specific account.
   class AccountResource < BaseNew
 
-    inheritable_schema do
-      String :account_id, :null=>false, :index=>true
-    end
-
     def account
       Account[self.account_id]
     end

data/lib/dcmgr/models/base_new.rb

@@ -131,7 +131,13 @@ module Dcmgr::Models
       end
 
       def to_hash()
-        self.values.dup.merge({:id=>canonical_uuid, :uuid=>canonical_uuid})
+        self.values.dup.merge({:id=>self.id, :uuid=>canonical_uuid})
+      end
+
+      # generate API response document. similar to to_hash() but not
+      # to expose integer primary key.
+      def to_api_document
+        self.values.dup.merge({:id=>self.canonical_uuid, :uuid=>canonical_uuid})
       end
     end
 
@@ -186,7 +192,7 @@ module Dcmgr::Models
 
       # Checks the general uuid syntax
       def check_trimmed_uuid_format(uuid)
-        uuid.match(/^[a-z0-9 ]*$/) && uuid.length <= 8
+        uuid.match(/^[a-z0-9]*$/) && uuid.length <= 255
       end
 
       # Checks the uuid syntax if it is for the Taggable class.
@@ -398,6 +404,10 @@ module Dcmgr::Models
 
   class BaseNew < Sequel::Model
 
+    def to_hash()
+      self.values.dup
+    end
+    
     LOCK_TABLES_KEY='__locked_tables'
 
     def self.default_row_lock_mode=(mode)
@@ -479,8 +489,10 @@ module Dcmgr::Models
     private
     def self.inherited(klass)
       super
+      klass.set_dataset(db[klass.implicit_table_name])
 
       klass.plugin InheritableSchema
+      klass.plugin :timestamps, :update_on_create=>true
       klass.class_eval {
 
         # Add timestamp columns and set callbacks using Timestamps

data/lib/dcmgr/models/dhcp_range.rb

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+
+require 'ipaddress'
+
+module Dcmgr::Models
+  # Dynamic IP address range in the network.
+  class DhcpRange < BaseNew
+
+    many_to_one :network
+
+    def validate
+      super
+
+      if !self.network.ipv4_ipaddress.include?(self.range_begin)
+        errors.add(:range_begin, "Out of subnet range: #{self.range_begin}")
+      end
+      
+      if !self.network.ipv4_ipaddress.include?(self.range_end)
+        errors.add(:range_end, "Out of subnet range: #{self.range_end}")
+      end
+
+      if !(self.range_begin <= self.range_end)
+        # swap values.
+        t = self[:range_end]
+        self[:range_end] = self[:range_begin]
+        self[:range_begin] = t
+      end
+    end
+
+    def range_begin
+      IPAddress::IPv4.new("#{super}/#{network.prefix}")
+    end
+
+    def range_end
+      IPAddress::IPv4.new("#{super}/#{network.prefix}")
+    end
+  end
+end

data/lib/dcmgr/models/frontend_system.rb

@@ -5,12 +5,6 @@ module Dcmgr::Models
     
     plugin :single_table_inheritance, :kind
     
-    inheritable_schema do
-      String :kind, :null=>false
-      String :key, :null=>false, :size=>40, :unique=>true
-      String :credential
-    end
-
     def authenticate
       raise NotImplementedError
     end

data/lib/dcmgr/models/history.rb

@@ -3,17 +3,6 @@
 module Dcmgr::Models
   # History record table for ArchiveChangedColumn plugin
   class History < BaseNew
-    set_dataset(:histories)
-    
-    inheritable_schema do
-      String :uuid, :size=>50, :null=>false
-      String :attr, :null=>false
-      String :vchar_value, :null=>true
-      String :blob_value, :null=>true, :text=>true
-      Time  :created_at, :null=>false
-      index [:uuid, :created_at]
-      index [:uuid, :attr]
-    end
 
     plugin :timestamps
     

data/lib/dcmgr/models/host_node.rb

@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+
+require 'isono/models/node_state'
+
+module Dcmgr::Models
+  class HostNode < AccountResource
+    taggable 'hn'
+
+    HYPERVISOR_XEN_34='xen-3.4'
+    HYPERVISOR_XEN_40='xen-4.0'
+    HYPERVISOR_KVM='kvm'
+    HYPERVISOR_LXC='lxc'
+
+    ARCH_X86=:x86.to_s
+    ARCH_X86_64=:x86_64.to_s
+
+    SUPPORTED_ARCH=[ARCH_X86, ARCH_X86_64]
+    SUPPORTED_HYPERVISOR=[HYPERVISOR_KVM, HYPERVISOR_LXC]
+
+    one_to_many :instances
+    many_to_one :node, :class=>Isono::Models::NodeState, :key=>:node_id, :primary_key=>:node_id
+
+    def_dataset_method(:online_nodes) do
+      # SELECT * FROM `host_nodes` WHERE ('node_id' IN (SELECT `node_id` FROM `node_states` WHERE (`state` = 'online')))
+      r = Isono::Models::NodeState.filter(:state => 'online').select(:node_id)
+      filter(:node_id => r)
+    end
+
+    def validate
+      super
+      # for compatibility: hva.xxx or hva-xxxx
+      unless self.node_id =~ /^hva[-.]/
+        errors.add(:node_id, "is invalid ID: #{self.node_id}")
+      end
+
+      if (h = self.class.filter(:node_id=>self.node_id).first) && h.id != self.id
+        errors.add(:node_id, " #{self.node_id} is already been associated to #{h.canonical_uuid} ")
+      end
+      
+      unless SUPPORTED_ARCH.member?(self.arch)
+        errors.add(:arch, "unknown architecture type: #{self.arch}")
+      end
+
+      unless self.offering_cpu_cores > 0
+        errors.add(:offering_cpu_cores, "it must have digit more than zero")
+      end
+      unless self.offering_memory_size > 0
+        errors.add(:offering_memory_size, "it must have digit more than zero")
+      end
+    end
+
+    def to_hash
+      super.merge(:status=>self.status)
+    end
+
+    # Check if the resources exist depending on the HostNode.
+    # @return [boolean] 
+    def depend_resources?
+      !self.instances_dataset.runnings.empty?
+    end
+    
+    def status
+      node.nil? ? :offline : node.state
+    end
+
+    # Returns true/false if the host pool has enough capacity to run the spec.
+    # @param [InstanceSpec] spec 
+    def check_capacity(spec)
+      raise TypeError unless spec.is_a?(InstanceSpec)
+      inst_on_hp = self.instances_dataset.lives.all
+
+      (self.offering_cpu_cores >= inst_on_hp.inject(0) {|t, i| t += i.cpu_cores } + spec.cpu_cores) &&
+        (self.offering_memory_size >= inst_on_hp.inject(0) {|t, i| t += i.memory_size } + spec.memory_size)
+    end
+    
+    def to_api_document
+      h = super()
+      h.merge!(:status=>self.status)
+      h.delete(:node_id)
+      h
+    end
+
+    # Returns reserved CPU cores used by running/scheduled instances.
+    def cpu_core_usage
+      instances_usage(:cpu_cores)
+    end
+
+    # Returns reserved memory size used by running/scheduled instances.
+    def memory_size_usage
+      instances_usage(:memory_size)
+    end
+
+    # Returns available CPU cores.
+    def available_cpu_cores
+      self.offering_cpu_cores - self.cpu_core_usage
+    end
+
+    # Returns available memory size.
+    def available_memory_size
+      self.offering_memory_size - self.memory_size_usage
+    end
+
+    # Check the free resource capacity across entire local VDC domain.
+    def self.check_domain_capacity?(cpu_cores, memory_size, num=1)
+      alives_mem_size = Instance.dataset.lives.filter.sum(:memory_size).to_i
+      stopped_mem_size = Instance.dataset.lives.filter(:state=>'stopped').sum(:memory_size).to_i
+      alives_cpu_cores = Instance.dataset.lives.filter.sum(:cpu_cores).to_i
+      stopped_cpu_cores = Instance.dataset.lives.filter(:state=>'stopped').sum(:cpu_cores).to_i
+      # instance releases the resources during stopped state normally. however admins may
+      # want to manage the reserved resource ratio for stopped
+      # instances. "stopped_instance_usage_factor" conf parameter allows its control.
+      # 
+      # * stopped_instance_usage_factor == 1.0 means that 100% of
+      # resources are reserved for stopped instances. all of them will
+      # success to start up but utilization of host notes will be dropped.
+      # * stopped_instance_usage_factor == 0.5 means that 50% of
+      # resources for stopped instances are reserved and rest of 50%
+      # may fail to start again.
+      usage_factor = (Dcmgr.conf.stopped_instance_usage_factor || 1.0).to_f
+      avail_mem_size = self.online_nodes.sum(:offering_memory_size).to_i - ((alives_mem_size - stopped_mem_size) + (stopped_mem_size * usage_factor).floor)
+      avail_cpu_cores = self.online_nodes.sum(:offering_cpu_cores).to_i - ((alives_cpu_cores - stopped_cpu_cores) + (stopped_cpu_cores * usage_factor).floor)
+      
+      (avail_mem_size >= memory_size * num.to_i) && (avail_cpu_cores >= cpu_cores * num.to_i)
+    end
+
+    protected
+    def instances_usage(colname)
+      instances_dataset.lives.sum(colname).to_i
+    end
+  end
+end

data/lib/dcmgr/models/hostname_lease.rb

@@ -3,13 +3,5 @@
 module Dcmgr::Models
   # hostname table for each instance to ensure uniqueness.
   class HostnameLease < BaseNew
-
-    inheritable_schema do
-      String :account_id, :null=>false, :size=>50
-      String :hostname, :null=>false, :size=>32
-
-      index [:account_id, :hostname], {:unique=>true}
-    end
-    with_timestamps
   end
 end

data/lib/dcmgr/models/image.rb

@@ -4,38 +4,33 @@ module Dcmgr::Models
   # Metadata catalogs for bootable image file.
   class Image < AccountResource
     taggable 'wmi'
-    with_timestamps
 
     BOOT_DEV_SAN=1
     BOOT_DEV_LOCAL=2
 
-    inheritable_schema do
-      Fixnum :boot_dev_type, :null=>false, :default=>BOOT_DEV_SAN
-      Text :source, :null=>false
-      String :arch, :size=>10, :null=>false
-      Text :description
-      Boolean :is_public, :null=>false, :default=>false
-      #Fixnum :parent_image_id
-      String :format, :null=>false, :default=>'raw'
-
-      String :state, :size=>20, :null=>false, :default=>:init.to_s
-      index :is_public
-    end
-
     # serialize plugin must be defined at the bottom of all class
     # method calls.
     # Possible source column data:
     # {:snapshot_id=>'snap-xxxxxx'}
     # {:uri=>'http://localhost/xxx/xxx'}
     plugin :serialization
-    serialize_attributes :yaml, :source
+    serialize_attributes :yaml, :source, :features
     
+    def after_initialize
+      super
+      unless self.features.is_a?(Hash) 
+        self.features = {}
+      end
+    end
+
     def validate
+      super
+      
       unless [BOOT_DEV_SAN, BOOT_DEV_LOCAL].member?(self.boot_dev_type)
         errors.add(:boot_dev_type, "Invalid boot dev type: #{self.boot_dev_type}")
       end
       
-      unless HostPool::SUPPORTED_ARCH.member?(self.arch)
+      unless HostNode::SUPPORTED_ARCH.member?(self.arch)
         errors.add(:arch, "Unsupported arch type: #{self.arch}")
       end
       
@@ -50,7 +45,7 @@ module Dcmgr::Models
     end
 
     def to_hash
-      super.merge({:source=>self.source.dup, :description=>description.to_s})
+      super.merge({:source=>self.source, :description=>self.description.to_s, :features=>self.features})
     end
 
     # note on "lookup_account_id":
@@ -59,7 +54,7 @@ module Dcmgr::Models
     # an argument who is looking into then filters the data in source
     # column accordingly.
     def to_api_document(lookup_account_id)
-      h = to_hash
+      h = super()
       if self.account_id == lookup_account_id
       else
         if h[:source][:type] == :http
@@ -69,6 +64,24 @@ module Dcmgr::Models
       end
       h
     end
+
+    # TODO: more proper key&value validation.
+    # Handles the feature blob column.
+    def set_feature(key, value)
+      case key.to_sym
+      when :virtio
+        self.features[:virtio] = value
+      else
+        raise "Unsupported feature: #{key}"
+      end
+
+      self.changed_columns << :features
+      self
+    end
+
+    def get_feature(key)
+      self.features[key]
+    end
     
   end
 end