Save inventory container: remove target option #15182

zakiva · 2017-05-22T12:45:59Z

This logic was probably meant to support a targeted refresh which we do not use or plan to. However, it actually causes us a problem since the target isn't being passed through the recursive calls.
Partial refresh for containers entities will be introduced as part of the container graph refresh in #14337. Meanwhile, I suggest we remove this code:

Remove target argument from save inventory container methods.
Remove deletes variable and always pass :use_association instead.

This should solve:
https://bugzilla.redhat.com/show_bug.cgi?id=1436132
https://bugzilla.redhat.com/show_bug.cgi?id=1451832

Still need to add tests.

cc @cben @moolitayer @simon3z

zakiva · 2017-05-22T16:15:54Z

@miq-bot add_label providers/containers, bug

simon3z · 2017-05-22T21:42:16Z

cc @cben @moolitayer
This worries me a little because I have the feeling we'll need some really good testing before deeming it stable enough for a stable release.

cben · 2017-05-23T09:20:33Z

We didn't do really good testing when introduced this broken code several stable releases ago ;-)
I'm very interested in more tests, we should assume graph refresh will break any untested aspects, with an emphasis on deletions.

Current tests I'm aware of check only:

Refresh into empty DB.
Idempotence: 2nd refresh of unchanged inventory into same DB.

Don't have but ought to:

Additions/changes then refresh. (Not for this PR, but we want some.)
Deletions then refresh. Should also test what gets deleted vs disconnected.

Had some discussions with @zakiva, with some ideas how to reproducibly record more complex scenarios.

moolitayer · 2017-05-24T15:10:23Z

Would love to see this unused code go away

simon3z · 2017-06-01T15:10:43Z

@cben @moolitayer can you test/review/approve?
How confident are we on this fix? Have you tested/verified this properly?

cben

@zakiva are the tests ManageIQ/manageiq-providers-openshift#18 close to ready? Can I help?

I'm confident in this to 👍 merging before the tests (and you have been testing this a lot), but I think it's good procedure to have tests before backporting.

zakiva · 2017-06-21T08:54:15Z

@zakiva are the tests ManageIQ/manageiq-providers-openshift#18 close to ready?

Yes, added also the k8s tests in ManageIQ/manageiq-providers-kubernetes#44 both pending review/merge

cben

kubernetes tests merged, ManageIQ/manageiq-providers-openshift#18 is only pending on this PR, right?

moolitayer · 2017-06-25T12:07:11Z

app/models/ems_refresh/save_inventory_container.rb

@@ -1,6 +1,5 @@
 module EmsRefresh::SaveInventoryContainer
  def save_ems_container_inventory(ems, hashes, target = nil)


zakiva · 2017-06-25T12:50:21Z

kubernetes tests merged, ManageIQ/manageiq-providers-openshift#18 is only pending on this PR, right?

@cben yes

miq-bot · 2017-06-25T12:58:04Z

Checked commit zakiva@c2ce88f with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
1 file checked, 0 offenses detected
Everything looks fine. 🍰

moolitayer

LGTM 👍
Hurry for removing unused code!

moolitayer · 2017-06-25T14:02:16Z

@simon3z please review

simon3z · 2017-07-11T13:58:08Z

@miq-bot add_label fine/yes

simon3z

LGTM 👍
cc @chrispy1

blomquisg · 2017-07-11T14:47:38Z

Overall this looks OK to me, but I've asked @agrare to be the merger on it to make sure I didn't miss anything. A change like this has a chance of nasty side effects if something fundamental is missed, and Adam has been living in Inventory for several months now.

agrare

You're right save_inventory_multi doesn't have a way to pass args to save_child_inventory None of the other child save methods took a target parameter but I see at least save_labels_inventory here does.

👍 to this since the target was never used here anyway. In the future we could add the ability for save_inventory_mutli to pass other args to the child save methods

simon3z · 2017-07-11T15:10:48Z

@agrare @blomquisg we have the FINE backport here:

#15543

It also includes extra-tests to be on the safe side.

simon3z · 2017-07-11T15:13:19Z

@agrare @blomquisg we have the FINE backport here:

#15543

It also includes extra-tests to be on the safe side.

@agrare @blomquisg I asked @cben and @zakiva to have a FINE PR with both the extra-tests and this PR, although it doesn't seem that one yet (it seems it's just the tests).

agrare · 2017-07-11T15:15:25Z

@zakiva can you cherry-pick the merge commit to your fine pr with the added tests? That way the tests can run on the PR before backporting it.

blomquisg · 2017-07-11T15:17:38Z

@simon3z 😄 I was a little confused looking at #15543.

If you want to have #15543 be the Fine backport for this PR, just remember to remove the Fine/yes label from this PR.

zakiva · 2017-07-11T15:35:20Z

@miq-bot rm_label fine/yes
will backport in #15543 with some tests

simaishi · 2017-07-11T16:10:59Z

Backported to Fine via #15543

simaishi · 2017-07-14T16:57:10Z

@zakiva @agrare The BZ flag indicates this change needs to be backported to Euwe branch. Not sure if #15543 should be backported to Euwe or you'd need a separate PR for Euwe. Please advise.

zakiva · 2017-07-16T11:31:17Z

Sent a separate PR for Euwe: #15573

simaishi · 2017-07-18T15:26:32Z

Backported to Euwe via #15573

miq-bot added the wip label May 22, 2017

miq-bot added bug providers/containers labels May 22, 2017

zakiva mentioned this pull request Jun 1, 2017

Refresher_spec: Add deletions tests ManageIQ/manageiq-providers-openshift#18

Merged

zakiva changed the title ~~[WIP] Save inventory container: remove target option~~ Save inventory container: remove target option Jun 1, 2017

miq-bot removed the wip label Jun 1, 2017

chessbyte assigned simon3z Jun 2, 2017

cben approved these changes Jun 20, 2017

View reviewed changes

cben approved these changes Jun 25, 2017

View reviewed changes

moolitayer reviewed Jun 25, 2017

View reviewed changes

zakiva force-pushed the remove_target branch from 8b56a74 to c2ce88f Compare June 25, 2017 12:53

Save inventory container: remove target option

c2ce88f

moolitayer approved these changes Jun 25, 2017

View reviewed changes

miq-bot added the fine/yes label Jul 11, 2017

simon3z approved these changes Jul 11, 2017

View reviewed changes

chessbyte assigned blomquisg and agrare and unassigned simon3z Jul 11, 2017

zakiva mentioned this pull request Jul 11, 2017

[FINE] Save inventory container: remove target option #15543

Merged

agrare approved these changes Jul 11, 2017

View reviewed changes

agrare merged commit aa7b13f into ManageIQ:master Jul 11, 2017

agrare added this to the Sprint 65 Ending Jul 24, 2017 milestone Jul 11, 2017

miq-bot removed the fine/yes label Jul 11, 2017

chessbyte unassigned blomquisg Jul 11, 2017

simaishi added the fine/backported label Jul 11, 2017

cben mentioned this pull request Jul 11, 2017

Delete Container/AWS labels that no longer exist on the provider. #14388

Closed

zakiva mentioned this pull request Jul 16, 2017

[EUWE] Save inventory container: remove target option #15573

Merged

simaishi added the euwe/backported label Jul 18, 2017

bronaghs mentioned this pull request Oct 13, 2017

[WIP] Specs to test the cleanup of labels deleted on AWS ManageIQ/manageiq-providers-amazon#205

Closed

Save inventory container: remove target option #15182

Save inventory container: remove target option #15182

zakiva commented May 22, 2017 •

edited

zakiva commented May 22, 2017

simon3z commented May 22, 2017

cben commented May 23, 2017 •

edited

moolitayer commented May 24, 2017

simon3z commented Jun 1, 2017

cben left a comment

zakiva commented Jun 21, 2017

cben left a comment

moolitayer Jun 25, 2017

zakiva commented Jun 25, 2017

miq-bot commented Jun 25, 2017

moolitayer left a comment

moolitayer commented Jun 25, 2017

simon3z commented Jul 11, 2017

simon3z left a comment

blomquisg commented Jul 11, 2017

agrare left a comment

simon3z commented Jul 11, 2017

simon3z commented Jul 11, 2017

agrare commented Jul 11, 2017

blomquisg commented Jul 11, 2017

zakiva commented Jul 11, 2017

simaishi commented Jul 11, 2017

simaishi commented Jul 14, 2017

zakiva commented Jul 16, 2017

simaishi commented Jul 18, 2017

		@@ -1,6 +1,5 @@
		module EmsRefresh::SaveInventoryContainer
		def save_ems_container_inventory(ems, hashes, target = nil)

Save inventory container: remove target option #15182

Save inventory container: remove target option #15182

Conversation

zakiva commented May 22, 2017 • edited

zakiva commented May 22, 2017

simon3z commented May 22, 2017

cben commented May 23, 2017 • edited

moolitayer commented May 24, 2017

simon3z commented Jun 1, 2017

cben left a comment

Choose a reason for hiding this comment

zakiva commented Jun 21, 2017

cben left a comment

Choose a reason for hiding this comment

moolitayer Jun 25, 2017

Choose a reason for hiding this comment

zakiva commented Jun 25, 2017

miq-bot commented Jun 25, 2017

moolitayer left a comment

Choose a reason for hiding this comment

moolitayer commented Jun 25, 2017

simon3z commented Jul 11, 2017

simon3z left a comment

Choose a reason for hiding this comment

blomquisg commented Jul 11, 2017

agrare left a comment

Choose a reason for hiding this comment

simon3z commented Jul 11, 2017

simon3z commented Jul 11, 2017

agrare commented Jul 11, 2017

blomquisg commented Jul 11, 2017

zakiva commented Jul 11, 2017

simaishi commented Jul 11, 2017

simaishi commented Jul 14, 2017

zakiva commented Jul 16, 2017

simaishi commented Jul 18, 2017

zakiva commented May 22, 2017 •

edited

cben commented May 23, 2017 •

edited