Skip to content
This repository has been archived by the owner on Aug 29, 2018. It is now read-only.

Bug 1111562 - Use gear uuid correctly in messages #5884

Merged
merged 1 commit into from
Oct 17, 2014
Merged

Bug 1111562 - Use gear uuid correctly in messages #5884

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions plugins/msg-broker/mcollective/lib/openshift/mcollective_application_container_proxy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1828,8 +1828,8 @@ def move_gear_post(gear, destination_container, state_map)
end
end

log_debug "DEBUG: Fixing DNS and mongo for gear '#{gear.name}' after move"
log_debug "DEBUG: Changing server identity of '#{gear.name}' from '#{source_container.id}' to '#{destination_container.id}'"
log_debug "DEBUG: Fixing DNS and mongo for gear '#{gear.uuid}' after move"
log_debug "DEBUG: Changing server identity of '#{gear.uuid}' from '#{source_container.id}' to '#{destination_container.id}'"
gear.server_identity = destination_container.id
# Persist server identity for gear in mongo
res = Application.where({"_id" => app.id, "gears.uuid" => gear.uuid}).update({"$set" => {"gears.$.server_identity" => gear.server_identity}})
Expand Down Expand Up @@ -2079,7 +2079,7 @@ def move_gear(gear, destination_container, destination_district_uuid, change_dis
res = Application.where({"_id" => app.id, "group_instances._id" => gear.group_instance.id}).update({"$set" => {"group_instances.$.gear_size" => gear.group_instance.gear_size}})
raise OpenShift::OOException.new("Could not set group instance gear_size to #{gear.group_instance.gear_size}") if res.nil? or !res["updatedExisting"]
# destroy destination
log_debug "DEBUG: Moving failed. Rolling back gear '#{gear.name}' in '#{app.name}' with delete on '#{destination_container.id}'"
log_debug "DEBUG: Moving failed. Rolling back gear '#{gear.uuid}' in '#{app.name}' with delete on '#{destination_container.id}'"
reply.append destination_container.destroy(gear, !district_changed, nil, true)

raise
Expand Down Expand Up @@ -2254,12 +2254,12 @@ def rsync_destination_container(gear, destination_container, destination_distric
source_container = gear.get_proxy
platform = gear.group_instance.platform
log_debug "DEBUG: Gear platform is '#{platform}'"
log_debug "DEBUG: Creating new account for gear '#{gear.name}' on #{destination_container.id}"
log_debug "DEBUG: Creating new account for gear '#{gear.uuid}' on #{destination_container.id}"
sshkey_required = false
initial_deployment_dir_required = false
reply.append destination_container.create(gear, quota_blocks, quota_files, sshkey_required, initial_deployment_dir_required)
rsync_keyfile = Rails.configuration.auth[:rsync_keyfile]
log_debug "DEBUG: Moving content for app '#{app.name}', gear '#{gear.name}' to #{destination_container.id}"
log_debug "DEBUG: Moving content for app '#{app.name}', gear '#{gear.uuid}' to #{destination_container.id}"
case platform.downcase
when "windows"
#Rsync arguments had to be changed for windows to move the gear with full rights and reset them correctly in the post move method
Expand All @@ -2269,10 +2269,10 @@ def rsync_destination_container(gear, destination_container, destination_distric
end

if $?.exitstatus != 0
raise OpenShift::NodeException.new("Error moving app '#{app.name}',platform '#{platform}', gear '#{gear.name}' from #{source_container.id} to #{destination_container.id}", 143)
raise OpenShift::NodeException.new("Error moving app '#{app.name}',platform '#{platform}', gear '#{gear.uuid}' from #{source_container.id} to #{destination_container.id}", 143)
end

log_debug "DEBUG: Moving system components for app '#{app.name}', gear '#{gear.name}' to #{destination_container.id}"
log_debug "DEBUG: Moving system components for app '#{app.name}', gear '#{gear.uuid}' to #{destination_container.id}"
case platform.downcase
when "windows"
#Rsync arguments changed, preserving extended attributes and ACLs cannot be used on windows
Expand All @@ -2282,7 +2282,7 @@ def rsync_destination_container(gear, destination_container, destination_distric
end

if $?.exitstatus != 0
raise OpenShift::NodeException.new("Error moving system components for app '#{app.name}', platform '#{platform}', gear '#{gear.name}' from #{source_container.id} to #{destination_container.id}", 143)
raise OpenShift::NodeException.new("Error moving system components for app '#{app.name}', platform '#{platform}', gear '#{gear.uuid}' from #{source_container.id} to #{destination_container.id}", 143)
end

unless platform.downcase == "windows"
Expand Down