Skip to content

Commit

Permalink
Merge pull request #15605 from Ladas/custom_reconnect_block
Browse files Browse the repository at this point in the history 
Custom reconnect block
  • Loading branch information
@agrare
agrare authored Jul 24, 2017
2 parents d7be775 + f805115 commit 7faa944
Show file tree
Hide file tree
Showing 3 changed files with 119 additions and 27 deletions.
85 changes: 58 additions & 27 deletions app/models/manager_refresh/inventory_collection.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ class InventoryCollection
:custom_db_finder, :check_changed, :arel, :builder_params, :loaded_references, :db_data_index,
:inventory_object_attributes, :name, :saver_strategy, :parent_inventory_collections, :manager_uuids,
:skeletal_manager_uuids, :targeted_arel, :targeted, :manager_ref_allowed_nil, :use_ar_object,
:secondary_refs, :secondary_indexes, :created_records, :updated_records, :deleted_records
:secondary_refs, :secondary_indexes, :created_records, :updated_records, :deleted_records,
:custom_reconnect_block

delegate :each, :size, :to => :to_a

Expand Down Expand Up @@ -142,6 +143,34 @@ class InventoryCollection
# stack.update_attribute(:parent, parent)
# end
# end
# @param custom_reconnect_block [Proc] A custom lambda for reconnect logic of previously disconnected records
#
# Example - Reconnect disconnected Vms
# ManagerRefresh::InventoryCollection.new({
# :association => :orchestration_stack_ancestry,
# :custom_reconnect_block => vms_custom_reconnect_block,
# })
#
# And the labmda is defined as:
# vms_custom_reconnect_block = lambda do |inventory_collection, inventory_objects_index, attributes_index|
# inventory_objects_index.each_slice(1000) do |batch|
# Vm.where(:ems_ref => batch.map(&:second).map(&:manager_uuid)).each do |record|
# index = inventory_collection.object_index_with_keys(inventory_collection.manager_ref_to_cols, record)
#
# # We need to delete the record from the inventory_objects_index and attributes_index, otherwise it
# # would be sent for create.
# inventory_object = inventory_objects_index.delete(index)
# hash = attributes_index.delete(index)
#
# record.assign_attributes(hash.except(:id, :type))
# if !inventory_collection.check_changed? || record.changed?
# record.save!
# inventory_collection.store_updated_records(record)
# end
#
# inventory_object.id = record.id
# end
# end
# @param delete_method [Symbol] A delete method that will be used for deleting of the InventoryObject, if the
# object is marked for deletion. A default is :destroy, the instance method must be defined on the
# :model_class.
Expand Down Expand Up @@ -345,32 +374,34 @@ def initialize(model_class: nil, manager_ref: nil, association: nil, parent: nil
check_changed: nil, custom_manager_uuid: nil, custom_db_finder: nil, arel: nil, builder_params: {},
inventory_object_attributes: nil, unique_index_columns: nil, name: nil, saver_strategy: nil,
parent_inventory_collections: nil, manager_uuids: [], all_manager_uuids: nil, targeted_arel: nil,
targeted: nil, manager_ref_allowed_nil: nil, secondary_refs: {}, use_ar_object: nil)
@model_class = model_class
@manager_ref = manager_ref || [:ems_ref]
@secondary_refs = secondary_refs
@custom_manager_uuid = custom_manager_uuid
@custom_db_finder = custom_db_finder
@association = association || []
@parent = parent || nil
@arel = arel
@dependency_attributes = dependency_attributes || {}
@data = data || []
@data_index = data_index || {}
@secondary_indexes = secondary_refs.map {|name, keys| [name, {}] }.to_h
@saved = saved || false
@strategy = process_strategy(strategy)
@delete_method = delete_method || :destroy
@custom_save_block = custom_save_block
@check_changed = check_changed.nil? ? true : check_changed
@internal_attributes = [:__feedback_edge_set_parent]
@complete = complete.nil? ? true : complete
@update_only = update_only.nil? ? false : update_only
@builder_params = builder_params
@unique_index_columns = unique_index_columns
@name = name || association || model_class.to_s.demodulize.tableize
@saver_strategy = process_saver_strategy(saver_strategy)
@use_ar_object = use_ar_object || false
targeted: nil, manager_ref_allowed_nil: nil, secondary_refs: {}, use_ar_object: nil,
custom_reconnect_block: nil)
@model_class = model_class
@manager_ref = manager_ref || [:ems_ref]
@secondary_refs = secondary_refs
@custom_manager_uuid = custom_manager_uuid
@custom_db_finder = custom_db_finder
@association = association || []
@parent = parent || nil
@arel = arel
@dependency_attributes = dependency_attributes || {}
@data = data || []
@data_index = data_index || {}
@secondary_indexes = secondary_refs.map { |n, _k| [n, {}] }.to_h
@saved = saved || false
@strategy = process_strategy(strategy)
@delete_method = delete_method || :destroy
@custom_save_block = custom_save_block
@custom_reconnect_block = custom_reconnect_block
@check_changed = check_changed.nil? ? true : check_changed
@internal_attributes = [:__feedback_edge_set_parent]
@complete = complete.nil? ? true : complete
@update_only = update_only.nil? ? false : update_only
@builder_params = builder_params
@unique_index_columns = unique_index_columns
@name = name || association || model_class.to_s.demodulize.tableize
@saver_strategy = process_saver_strategy(saver_strategy)
@use_ar_object = use_ar_object || false

@manager_ref_allowed_nil = manager_ref_allowed_nil || []

Expand Down
4 changes: 4 additions & 0 deletions app/models/manager_refresh/save_collection/saver/base.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ def save!(inventory_collection, association)
end
end

unless inventory_collection.custom_reconnect_block.nil?
inventory_collection.custom_reconnect_block.call(inventory_collection, inventory_objects_index, attributes_index)
end

# Records that were not found in the DB but sent for saving, we will be creating these in the DB.
if inventory_collection.create_allowed?
ActiveRecord::Base.transaction do
Expand Down
57 changes: 57 additions & 0 deletions spec/models/manager_refresh/save_inventory/single_inventory_collection_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,63 @@
end
end
end

context 'testing reconnect logic' do
it 'reconnects existing VM' do
# Fill DB with test Vms
@vm1 = FactoryGirl.create(:vm_cloud, vm_data(1).merge(:ext_management_system => nil))
@vm2 = FactoryGirl.create(:vm_cloud, vm_data(2).merge(:ext_management_system => @ems))

vms_custom_reconnect_block = lambda do |inventory_collection, inventory_objects_index, attributes_index|
inventory_objects_index.each_slice(1000) do |batch|
Vm.where(:ems_ref => batch.map(&:second).map(&:manager_uuid)).each do |record|
index = inventory_collection.object_index_with_keys(inventory_collection.manager_ref_to_cols, record)

# We need to delete the record from the inventory_objects_index and attributes_index, otherwise it
# would be sent for create.
inventory_object = inventory_objects_index.delete(index)
hash = attributes_index.delete(index)

record.assign_attributes(hash.except(:id, :type))
if !inventory_collection.check_changed? || record.changed?
record.save!
inventory_collection.store_updated_records(record)
end

inventory_object.id = record.id
end
end
end

@data = {}
@data[:vms] = ::ManagerRefresh::InventoryCollection.new(
:model_class => ManageIQ::Providers::CloudManager::Vm,
:parent => @ems,
:association => :vms,
:custom_reconnect_block => vms_custom_reconnect_block,
)

# Fill the InventoryCollections with data, that have a modified name
add_data_to_inventory_collection(@data[:vms],
vm_data(1).merge(:name => "vm_changed_name_1"),
vm_data(2).merge(:name => "vm_changed_name_2"))

# Invoke the InventoryCollections saving
ManagerRefresh::SaveInventory.save_inventory(@ems, @data.values)

# Check the InventoryCollection result matches what was created/deleted/updated
expect(@data[:vms].created_records).to match_array([])
expect(@data[:vms].updated_records).to match_array([{:id => @vm1.id}, {:id => @vm2.id}])
expect(@data[:vms].deleted_records).to match_array([])

# Assert that saved data have the updated values, checking id to make sure the original records are updated
assert_all_records_match_hashes(
[Vm.all, @ems.vms],
{:id => @vm1.id, :ems_ref => "vm_ems_ref_1", :name => "vm_changed_name_1", :location => "vm_location_1"},
{:id => @vm2.id, :ems_ref => "vm_ems_ref_2", :name => "vm_changed_name_2", :location => "vm_location_2"}
)
end
end
end
end
end

0 comments on commit 7faa944

Please sign in to comment.