Skip to content

Commit

Permalink
Merge pull request #21790 from jrafanie/fix_fallout_from_deleting_fai…
Browse files Browse the repository at this point in the history
…led_deployments

Fix fallout from deleting failed deployments
  • Loading branch information
agrare authored Apr 20, 2022
2 parents b601dd7 + c2b3d84 commit 7c1302a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
8 changes: 7 additions & 1 deletion app/models/miq_server/worker_management/kubernetes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,13 @@ def sync_deployment_settings

if deployment_resource_constraints_changed?(worker)
_log.info("Constraints changed, patching deployment: [#{worker.worker_deployment_name}]")
worker.patch_deployment

begin
worker.patch_deployment
rescue => err
_log.warn("Failure patching deployment: [#{worker.worker_deployment_name}] for worker: id: [#{worker.id}], system_uid: [#{worker.system_uid}]. Error: [#{err}]... skipping")
next
end
end
checked_deployments << worker.worker_deployment_name
end
Expand Down
9 changes: 9 additions & 0 deletions spec/models/miq_server/worker_management/kubernetes_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,15 @@
expect(worker3).to receive(:patch_deployment)
server.worker_manager.sync_deployment_settings
end

it "skips worker classes missing their deployment" do
allow(server.worker_manager).to receive(:miq_workers).and_return([worker1, worker3])
allow(server.worker_manager).to receive(:deployment_resource_constraints_changed?).with(worker1).and_return(true)
allow(server.worker_manager).to receive(:deployment_resource_constraints_changed?).with(worker3).and_return(true)
allow(worker1).to receive(:patch_deployment).and_raise(StandardError.new("AHHHHHH!"))
expect(worker3).to receive(:patch_deployment)
server.worker_manager.sync_deployment_settings
end
end

context "deployment_resource_constraints_changed?" do
Expand Down

0 comments on commit 7c1302a

Please sign in to comment.