Bundle/catalog upgrade headers to specify upgrade maps#872
Merged
asfgit merged 9 commits intoapache:masterfrom Nov 1, 2017
Merged
Bundle/catalog upgrade headers to specify upgrade maps#872asfgit merged 9 commits intoapache:masterfrom
asfgit merged 9 commits intoapache:masterfrom
Conversation
refactor using fixtures to run more tests in both terminate-then-rebind and standby-promote modes, without duplicating assertions
…e mgmt.getNodeState() and make reused OSGi framework the default (much faster) with more tests
…ith catalog upgrades
…rep for upgrades)
…HA transition clearing fix recent rebind header tests which i forgot to test in previous, some subtle HA behaviours, but now all fixed and documented. need to clear type registry as part of other clears on HA promotion fail
tests with comments ready for ugprades (type registry lookup still prefers exact non-osgi version match but will use osgi)
robertgmoss
approved these changes
Nov 1, 2017
Contributor
robertgmoss
left a comment
robertgmoss
left a comment
There was a problem hiding this comment.
No obvious errors in the code. LGTM
ahgittin
added a commit
to ahgittin/brooklyn-server
that referenced
this pull request
Nov 1, 2017
This was referenced Nov 1, 2017
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
For indicating that bundles or types are valid upgrade targets for other items.
This does all the setup and tests (WIP) for when we actually apply upgrades -- in following PRs. This does not apply any of the upgrade info it collects! But it does parse the headers and test them in lots of variants, and lots of tidies up to related recent code.
The first of the follow-on PRs will apply upgrades if a type is not found (eg because we removed it), necessary for a clean update path. After that will look at letting user trigger updates.
As this PR mainly affects test code it should be fairly safe, even if quite involved in places. I suggest it isn't necessary to solve every corner case just yet (though I'm not aware of any that aren't), so long as the main upgrade paths are working (which will usually be the default
*- the other complexity shouldn't often be needed.)Some minor changes to type lookup, to accept OSGi-equivalent versions, and give a canonical order; also to node state, being more informative about saying it is up. Major changes to some of the tests, esp around the
REMOVEheaders in #866, to allow the same set of tests to run in HA Hot Standby or Master configuration, and to speed up tests (reuse osgi except in Integration).