wakame-vdc-agents 10.11.0 → 10.12.0

data/lib/dcmgr/models/tag_mapping.rb

@@ -2,22 +2,10 @@
 
 module Dcmgr::Models
   class TagMapping < BaseNew
-    TYPE_ACCOUNT = 0
-    TYPE_TAG = 1
-    TYPE_USER = 2
-    TYPE_INSTANCE = 3
-    TYPE_INSTANCE_IMAGE = 4
-    TYPE_HV_CONTROLLER = 5
-    TYPE_HV_AGENT = 6
-    TYPE_PHYSICAL_HOST = 7
-    TYPE_PHYSICAL_HOST_LOCATION = 8
-    TYPE_IMAGE_STORAGE_HOST = 9
-    TYPE_IMAGE_STORAGE = 10
-
     inheritable_schema do
       Fixnum :tag_id, :null=>false
+      String :uuid, :null=>false, :size=>20
       index :tag_id
-      String :uuid, :null=>false, :fixed=>true, :size=>20
       index :uuid
     end
     

data/lib/dcmgr/models/vlan_lease.rb

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+module Dcmgr::Models
+  # VLAN  lease information
+  class VlanLease < AccountResource
+    taggable 'vlan'
+
+    inheritable_schema do
+      Fixnum :tag_id, :null=>false
+
+      index :tag_id, {:unique=>true}
+    end
+    with_timestamps
+
+    one_to_many :networks
+  end
+end

data/lib/dcmgr/models/volume.rb

@@ -27,6 +27,7 @@ module Dcmgr::Models
       String :state, :null=>false, :default=>STATE_TYPE_REGISTERING
       Fixnum :size, :null=>false
       Fixnum :instance_id
+      Fixnum :boot_dev, :null=>false, :default=>0
       String :snapshot_id
       String :host_device_name
       String :guest_device_name
@@ -41,6 +42,11 @@ module Dcmgr::Models
     end
     with_timestamps
 
+    many_to_one :storage_pool
+    many_to_one :instance
+
+    plugin ArchiveChangedColumn, :histories
+    
     # serialization plugin must be defined at the bottom of all class
     # method calls.
     # Possible column data:
@@ -48,9 +54,6 @@ module Dcmgr::Models
     # {:iqn=>'iqn.1986-03.com.sun:02:a1024afa-775b-65cf-b5b0-aa17f3476bfc', :lun=>0}
     plugin :serialization, :yaml, :transport_information
     
-    many_to_one :storage_pool
-    many_to_one :instance
-
     class DiskError < RuntimeError; end
     class RequestError < RuntimeError; end
 
@@ -93,7 +96,7 @@ module Dcmgr::Models
         vl = vl.grep(data[:target].to_sym, "%#{filter}%")
       end
       vl.all.map{|row|
-        row.to_hash_document
+        row.to_api_document
       }
     end
 
@@ -108,18 +111,32 @@ module Dcmgr::Models
     end
 
     def merge_pool_data
-      v = self.to_hash_document
-      v.merge(:storage_pool=>storage_pool.to_hash_document)
+      v = self.to_hash
+      v.merge(:storage_pool=>storage_pool.to_hash)
     end
 
-    def to_hash_document
-      h = self.values.dup
-      h[:id] = h[:uuid] = h[:export_path] = self.canonical_uuid
+    def to_hash
+      h = super
       # yaml -> hash translation
       h[:transport_information]=self.transport_information
       h
     end
 
+    # Hash data for API response.
+    def to_api_document
+      h = {
+        :id => self.canonical_uuid,
+        :uuid => self.canonical_uuid,
+        :size => self.size,
+        :snapshot_id => self.snapshot_id,
+        :created_at => self.created_at,
+        :attached_at => self.attached_at,
+        :state => self.state,
+        :instance_id => (self.instance && self.instance.canonical_uuid),
+        :deleted_at => self.deleted_at,
+      }
+    end
+
     def create_snapshot(account_id)
       vs = VolumeSnapshot.create(:account_id=>account_id,
                                  :storage_pool_id=>self.storage_pool_id,

data/lib/dcmgr/models/volume_snapshot.rb

@@ -22,11 +22,20 @@ module Dcmgr::Models
     with_timestamps
 
     many_to_one :storage_pool
-
-    def to_hash_document
-      h = self.values.dup
-      h[:id] = h[:uuid] = self.canonical_uuid
-      h
+    plugin ArchiveChangedColumn, :histories
+
+    class RequestError < RuntimeError; end
+
+    # Hash data for API response.
+    def to_api_document
+      h = {
+        :id => self.canonical_uuid,
+        :uuid => self.canonical_uuid,
+        :state => self.state,
+        :size => self.size,
+        :origin_volume_id => self.origin_volume_id,
+        :created_at => self.created_at,
+      }
     end
 
     # create volume inherite from this snapshot for the account.
@@ -39,9 +48,13 @@ module Dcmgr::Models
       Volume[origin_volume_id]
     end
 
-    def delete_snapshot
-      self.state = STATE_TYPE_DELETING
-      self.save_changes
+    def self.delete_snapshot(account_id, uuid)
+      vs = self.dataset.where(:account_id => account_id).where(:uuid => uuid.split('-').last).first
+      if vs.state.to_sym != :available
+        raise RequestError, "invalid delete request"
+      end
+      vs.state = :deleting
+      vs.save_changes
     end
   end
 end

data/lib/dcmgr/node_modules/hva_collector.rb

@@ -34,7 +34,15 @@ module Dcmgr
       def update_instance(instance_id, data)
         Models::Instance.lock!
         inst = Models::Instance[instance_id]
-        inst.set_fields(data, [:state]).save
+        raise "UnknownInstanceID" if inst.nil?
+        if data[:state] == :terminated
+          inst.terminated_at = data[:terminated_at]
+          # Instance#destroy do not really delete row.
+          # just for chain react destroy hooks in the associated models.
+          inst.destroy
+        else
+          inst.set(data).save
+        end
         # do not respond model object.
         nil
       end
@@ -52,14 +60,31 @@ module Dcmgr
         inst = Models::Instance[instance_id]
         raise "UnknownInstanceID" if inst.nil?
 
-        insts = inst.netfilter_group_instances
-        ips = insts.map { |instance|
-          next if instance.nil?
-          instance.ips.map { |ip| ip.ipv4 unless ip.nil? }
-        }
+        ipv4s = inst.netfilter_groups.map { |netfilter_group|
+          next if netfilter_group.nil?
+          netfilter_group.instance_netfilter_groups.map { |instance_netfilter_group|
+            next if instance_netfilter_group.nil?
+            instance_netfilter_group.instance_dataset.lives.all.map { |instance|
+              next if instance.nil?
+              instance.ips.map { |ip|
+                next if ip.nil?
+                ip.ipv4
+              }
+            }
+          }
+        }.flatten.uniq.compact
+        ipv4s
+      end
 
-        ips.flatten! if ips.size > 0
-        ips.compact
+#      def get_instances_of_account_netfilter_group(account_id, netfilter_group_id)
+      def get_instances_of_account_netfilter_group(account_id, netfilter_group_name)
+        Models::NetfilterGroup.lock!
+        ng_map = Models::NetfilterGroup.find(:account_id => account_id, :name => netfilter_group_name)
+        raise "UnknownNetfilterGroupID" if ng_map.nil?
+        inst_maps = ng_map.instance_netfilter_groups.map { |instance_netfilter_group|
+          instance_netfilter_group.instance_dataset.lives.all.map { |inst| inst.to_hash }
+        }.flatten.uniq.compact
+        inst_maps
       end
 
       def get_network(network_id)
@@ -79,33 +104,55 @@ module Dcmgr
 
       def get_dhcp_conf(network_name)
         Models::Network.lock!
-        network = Models::Network.find(:name=>network_name)
-        raise "Unknown network name: #{network_name}" if network.nil?
-        prefix = IPAddress::Prefix32.new(network.prefix)
-        h = {
-          :ipv4_gw=>network.ipv4_gw,
-          :netmask => prefix.to_ip,
-          :prefix => network.prefix,
-          :dns_server=> network.dns_server,
-          :domain_name => network.domain_name,
-          :mac2addr => [],
-          :addr2host=> [],
-        }
-        
-        network.ip_lease.each { |ip|
-          # ignore IPs unbound to vnic.
-          next if ip.instance_nic.nil? || ip.instance_nic.instance.nil?
-          
-          h[:mac2addr] << {
-            :mac_addr => ip.instance_nic.pretty_mac_addr,
-            :ipaddr   => ip.ipv4
+
+        build_network_segment = proc { |network|
+          gwaddr = network.ipaddress
+          h = {
+            :uuid => network.canonical_uuid,
+            :ipv4_first => gwaddr.network.first.to_s,
+            :ipv4_last  => gwaddr.network.last.to_s,
+            :ipv4_gw=>network.ipv4_gw,
+            :netmask => gwaddr.network.prefix.to_ip,
+            :prefix => network.prefix,
+            :dns_server=> network.dns_server,
+            :domain_name => network.domain_name,
+            :metadata_server => network.metadata_server,
+            :mac2addr => [],
+            :addr2host=> [],
           }
-          h[:addr2host] << {
-            :hostname => ip.instance_nic.instance.fqdn_hostname,
-            :ipaddr   => ip.ipv4
+          
+          network.ip_lease_dataset.filter(:type=>Models::IpLease::TYPE_AUTO).each { |ip|
+            # ignore IPs unbound to vnic.
+            next if ip.instance_nic.nil? || ip.instance_nic.instance.nil?
+            
+            h[:mac2addr] << {
+              :mac_addr => ip.instance_nic.pretty_mac_addr,
+              :ipaddr   => ip.ipv4
+            }
+            h[:addr2host] << {
+              :hostname => ip.instance_nic.instance.fqdn_hostname,
+              :ipaddr   => ip.ipv4
+            }
           }
+          
+          h
         }
 
+        network_set = nil
+        Tags::NetworkPool
+        Models::Network
+        case network = Models::Taggable.find(network_name)
+        when Models::Network
+          network_set = [network]
+        when Tags::NetworkPool
+          network_set = network.mapped_uuids.map {|m| Models::Network[m.uuid] }
+        else
+          raise "Unknown network name: #{network_name}"
+        end
+        h = {}
+        network_set.each {|n|
+          h[n.canonical_uuid] = build_network_segment.call(n)
+        }
         h
       end
 
@@ -113,19 +160,22 @@ module Dcmgr
         Models::NetfilterGroup.lock!
         g = Models::NetfilterGroup[netfilter_group_id]
         raise "UnknownNetfilterGroupID" if g.nil?
-        inst_maps = g.instances.map { |instance| instance.to_hash unless instance.nil? }
-        inst_maps.compact
+        inst_maps = g.instance_netfilter_groups.map { |instance_netfilter_group|
+          instance_netfilter_group.instance_dataset.lives.all.map { |inst| inst.to_hash }
+        }.flatten.uniq.compact
+        inst_maps
       end
 
       def get_alive_instances(node_id)
         Models::HostPool.lock!
         hp = Models::HostPool.find(:node_id => node_id)
         raise "UnknownNodeID", node_id if hp.nil?
-
-        inst_on_hp = hp.instances_dataset.lives.all.map { |inst|
-          inst.to_hash
-        }
-        inst_on_hp.uniq! if inst_on_hp.size > 0
+        hps = Models::HostPool.where(:account_id => hp.account_id).all
+        inst_on_hp = hps.map { |hp|
+          inst_on_hp = hp.instances_dataset.lives.all.map { |inst|
+            inst.to_hash
+          }
+        }.flatten.uniq.compact
         inst_on_hp
       end
 

data/lib/dcmgr/node_modules/instance_ha.rb

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+require 'isono'
+
+module Dcmgr
+  module NodeModules
+    class InstanceHA < Isono::NodeModules::Base
+      include Dcmgr::Logger
+      
+      initialize_hook do
+        @thread_pool = Isono::ThreadPool.new
+        event = Isono::NodeModules::EventChannel.new(node)
+        event.subscribe('hva/fault_instance', '#') { |args|
+          @thread_pool.pass {
+            inst_id = args[0]
+            inst = Models::Instance[inst_id]
+            # check if the instance has HA enable.
+            next if inst.ha_enabled == 0
+            myinstance.restart_instance(inst)
+          }
+        }
+      end
+
+      terminate_hook do
+        @thread_pool.shutdown
+      end
+
+      def restart_instance(inst)
+        # terminate and cleanup
+        begin
+          jobrpc.run("kvm-handle.#{inst.host_pool.node_id}", 'cleanup', inst.canonical_uuid)
+        rescue => e
+          # termination may fail
+        end
+        
+        # TODO: pick a new host node
+        Isono::NodeModules::DataStore.barrier {
+          inst.state = :failingover
+          inst.save
+        }
+
+        # start a new backup instance
+        case inst.image.boot_dev_type
+        when Models::Image::BOOT_DEV_SAN
+          boot_vol = inst.volume.find {|v| v.boot_dev == 1 }
+          res = jobrpc.submit("kvm-handle.#{inst.host_pool.node_id}", 'run_vol_store', inst.canonical_uuid, boot_vol.canonical_uuid)
+        when Models::Image::BOOT_DEV_LOCAL
+          res = jobrpc.submit("kvm-handle.#{inst.host_pool.node_id}", 'run_local_store', inst.canonical_uuid)
+        else
+          raise "Unknown boot type"
+        end
+        logger.info("#{inst.canonical_uuid} has been restarted")
+      end
+      
+      private
+      def event
+        @event ||= Isono::NodeModules::EventChannel.new(node)
+      end
+
+      def jobrpc
+        @jobrpc ||= Isono::NodeModules::JobChannel.new(node)
+      end
+
+    end
+  end
+end

data/lib/dcmgr/node_modules/sta_collector.rb

@@ -29,7 +29,7 @@ module Dcmgr
       def get_snapshot(snapshot_id)
         Models::VolumeSnapshot.lock!
         vs = Dcmgr::Models::VolumeSnapshot[snapshot_id]
-        vs.to_hash_document
+        vs.to_hash
       end
 
       def update_volume(data)

data/lib/dcmgr/tags.rb

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+
+module Dcmgr::Tags
+  include Dcmgr
+  KEY_MAP={10=>:NetworkPool, 11=>:HostPool, 12=>:StoragePool}.freeze
+  MODEL_MAP=KEY_MAP.invert.freeze
+
+  def self.type_id(class_or_sym)
+    k = case class_or_sym
+    when String, Symbol
+      class_or_sym.to_sym
+    when Class
+      class_or_sym.to_s.split('::').last.to_sym
+    end
+
+    MODEL_MAP[k] || raise("Unknown key to get type_id: #{class_or_sym}")
+  end
+  
+  class NetworkPool < Models::Tag
+    def accept_mapping?(to)
+      to.is_a?(Dcmgr::Models::Network)
+    end
+
+    def pick()
+      lst = mapped_uuids.map { |t|
+        Dcmgr::Models::Network[t.uuid]
+      }.sort_by{ |n|
+        n.available_ip_nums
+      }.reverse.first
+    end
+  end
+  
+  class HostPool < Models::Tag
+    def accept_mapping?(to)
+      to.is_a?(Dcmgr::Models::HostNode)
+    end
+
+    def pick(spec)
+      mapped_uuids.map { |t|
+        Dcmgr::Models::HostPool[t.uuid]
+      }.find_all { |h|
+        h.check_capacity(spec)
+      }.sort_by { |h|
+        h.instances.count
+      }.reverse.first
+    end    
+  end
+  
+  class StoragePool < Models::Tag
+    def accept_mapping?(to)
+      to.is_a?(Dcmgr::Models::StorageNode)
+    end
+  end
+end