/juju

Feature resources #4569

Merged
merged 129 commits into from Mar 1, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@sinzui @jujubot @ericsnowcurrently @natefinch @kat-co
@sinzui
Contributor

sinzui commented Mar 1, 2016

This branch is good to merge. The failures seen on
http://reports.vapour.ws/releases/3675
are all attributed to master (which is the last merge into this branch)

There are no bugs reported against feature resources, there never was
https://bugs.launchpad.net/juju-core/feature-resources

(Review request: http://reviews.vapour.ws/r/4007/)

jujubot and others added some commits Feb 19, 2016

@jujubot
Merge pull request #4482 from kat-co/feature-resources-merge-master 
Merge master into feature-resources.



(Review request: http://reviews.vapour.ws/r/3915/)
016b654
@ericsnowcurrently @natefinch
Add Snapshot.CharmModified and use it to decide about upgrades.
e18269a
@ericsnowcurrently @natefinch
Add the CharmModified() method to the uniter service model.
e240607
@ericsnowcurrently @natefinch
Add Service.CharmModified().
578307a
@natefinch
squash all nate's commits together to make rebase easier.
437791e
@natefinch
couple more tests
f951d09
@natefinch
code review changes
b074f5d
@natefinch
code review change and make sure we only increment CharmModifiedVersi… 
…on if we change the bytes on a resource
9c9ca9b
@natefinch
last of the code review changes, plus some test fixes
7a543e4
@jujubot
Merge pull request #4475 from natefinch/new-fire-upgrade 
Fire upgrade charm when resources change

This PR adds code to cause the upgrade-charm hook to fire when a service's resources change (generally through `juju push-resource`). 

To do this, we added a CharmModifiedVersion field on the Service, which is an integer that gets incremented every time one of the resources is changed, or any time the charmURL changes.  The uniter code then considers changes to that as well as to charmURL when considering whether to fire upgrade-charm.

http://reviews.vapour.ws/r/3910/
548ab27
@ericsnowcurrently
Open resources from the charm store if not found in state.
c434194
@ericsnowcurrently
Set pass the name directly to HandleDownload().
5539f6c
@ericsnowcurrently
OpenResource() -> OpenResourceForUnit().
82d817f
@ericsnowcurrently
Add resource.Opener.
573e7ba
@ericsnowcurrently
Add resource.Unit.CharmURL().
7047c3c
@ericsnowcurrently
Add resource-based helpers for interacting with the charm store.
f0ae9a5
@ericsnowcurrently
Add adapters to combine the charm store with state.
e58826b
@ericsnowcurrently
Use the new adapters in the download API.
d3f9e85
@ericsnowcurrently
Use newCharmstoreOpener().
f87829b
@ericsnowcurrently
Add an interface for the charmstore client functionality used in Juju.
ab3160a
@ericsnowcurrently
Add ListResources to the charm store client.
bbb8e2e
@ericsnowcurrently
Add GetResource() to the top-level charmstore.Client interface.
63d56a1
@ericsnowcurrently
Split out a BaseClient interface and add a ListResources() method.
3ebcfb5
@ericsnowcurrently
Add a fake, temporary charmstore client.
6c3b06f
@ericsnowcurrently
Add a TODO.
67295c6
@ericsnowcurrently
Add NewFakeCharmStoreClient() and use it.
1c5051e
@ericsnowcurrently
Fix some compile-blocking typos.
0c3b07e
@ericsnowcurrently
Add NewFakeCharmCmdBase() and use it.
d935b76
@ericsnowcurrently
Add missing doc comments.
983dea5
@ericsnowcurrently
Add a TODO.
3224941
@ericsnowcurrently
Add missing doc comments.
1e2e174
@ericsnowcurrently
Retry when the charm store download request fails.
f3c7e39
@ericsnowcurrently
Log the (maybe) ignored error.
24f51f7
@ericsnowcurrently
Add StubUnit.
b73d50c
@ericsnowcurrently
Fix the state tests.
645efd2
@ericsnowcurrently
Make an error more specific.
a1bed26
@ericsnowcurrently
Use retry.Call() instead of utils.AttemptStrategy.
fbe2fa0
@ericsnowcurrently
Drop the resource/charmstore.Operations interface.
2dddeab
@ericsnowcurrently
Clarify a doc comment.
a281d1e
@ericsnowcurrently
Clean up a little.
a1ab685
@ericsnowcurrently
Factor out getResource().
5c916c5
@ericsnowcurrently
Drop charmstore.Operations.
5c85ded
@ericsnowcurrently
Drop resource/api/private/server.HandleDownload().
60331d7
@ericsnowcurrently
Fix a doc comment.
520c9d7
@ericsnowcurrently
APIHTTPRequestExtractorDeps -> StateConnector.
b3ccb46
@ericsnowcurrently
Downgrade a logger call.
1f6abee
@ericsnowcurrently
Drop TestingClient.
069126b
@ericsnowcurrently
Use a value receiver for cacheForOperations methods.
0b0af7a
@ericsnowcurrently
Add GetResourceArgs.validate().
cfcff09
@ericsnowcurrently
Clearly state that the entity cache is optional.
91cb037
@ericsnowcurrently
Fix a typo.
07c4f99
@ericsnowcurrently
Flatten out some error handling.
fe345fa
@ericsnowcurrently
Clarify a doc comment.
f846393
@ericsnowcurrently
APIHTTPRequestExtractor -> HTTPDownloadRequestExtractor (+ cleanup).
37fbc24
@ericsnowcurrently
Fix a doc comment.
8bc29ee
@ericsnowcurrently
Add a bit more context to the retry.CallArgs fields.
31576d7
@ericsnowcurrently
Drop errorShouldNotRetry().
6e6ef85
@ericsnowcurrently
Downgrade the logging level during retry attempts.
c6295c0
@ericsnowcurrently
Do not support using the charm store resource opener without a unit.
9a2b67c
@ericsnowcurrently
OpenResourceForUnit() -> OpenResourceForUniter().
46a20fc

ericsnowcurrently and others added some commits Feb 22, 2016

@ericsnowcurrently
resourceState.MarkOutdatedResources() -> .SetCharmStoreResources().
fc859fc
@ericsnowcurrently
Drop Resource.Outdated and add ServiceResources.CharmStoreResources.
c672676
@ericsnowcurrently
Add ServiceResources.Outdated().
d516ba7
@ericsnowcurrently
Clean up resourceadatapters/workers.go.
824e4c8
@ericsnowcurrently
Move the poll period to a constant.
2585cf0
@ericsnowcurrently
Factor out shouldStop().
a845890
@ericsnowcurrently
Fix the polling constant.
666ae54
@ericsnowcurrently
Drop stateWorkerFactory.
b3328f5
@ericsnowcurrently
Do not check for equality in RegisterWorker().
22bf8ee
@ericsnowcurrently
Only compare the revisions in Outdated().
4c2cabe
@ericsnowcurrently
Add a note.
93981bf
@ericsnowcurrently
Outdated() -> Updates().
6ca9b18
@ericsnowcurrently
Drop the "name" param from NewModelWorker().
060a979
@ericsnowcurrently
Drop WorkerFactory and one-registry-to-rule-them-all.
6d495c9
@ericsnowcurrently
Align the charm store resources with the service resources before fin… 
…ding updates.
cfb1d15
@ericsnowcurrently
Fix the state tests.
0dc95e0
@jujubot
Merge pull request #4456 from ericsnowcurrently/resources-worker-poll… 
…-charm-store

Add a worker that polls the charm store for changes in resources.

There are a number of efficiencies that may be applied, but this patch gets the ball rolling.

(Review request: http://reviews.vapour.ws/r/3891/)
7545de2
@natefinch
add support for showing updates in juju resources output
98a4454
@natefinch
fix a couple comments and remove an unneeded type
3e73130
@natefinch
code review updates... also crib some code from eric's branch to hand… 
…le updates for service resources
f479af9
@natefinch
support writing out updates available for juju resources servicename … 
…--details
1e6f916
@natefinch
code review changes
d164262
@natefinch
fixes post-rebase
a413fc3
@jujubot
Merge pull request #4509 from natefinch/resource-updates 
Add support for showing updates to resources in the store

This PR adds logic to display any resources in the store that are at a different revision from the resource the service is currently using, when using `juju resources foo`.

(Review request: http://reviews.vapour.ws/r/3945/)
c2fe02e
@natefinch
add CharmStoreResources to the API and the listresources test
d8d2956
@jujubot
Merge pull request #4525 from natefinch/charmres-serviceres 
add CharmStoreResources to the API and the listresources test

This was forgotten in the last patch... we needed to add the CharmStoreResources to the ListResources API call... also updates the listresources test so we test unitresources, since that was missing from earlier.

(Review request: http://reviews.vapour.ws/r/3961/)
7e9d442
@natefinch
initial API changes
45a8917
@natefinch
move datastore to resourceadapters so we can use it from state as well
96be5a1
@natefinch
missing file
701fb36
@natefinch
add charmstoreresources to api
ff73760
@natefinch
fix up some tests
829e6bb
@natefinch
better tests for list resources
6816f1f
@natefinch
refactor conversion into a helper
7c65854
@natefinch
test for new helper
f3468c2
@natefinch
compile fix
176d574
@jujubot
Merge pull request #4513 from natefinch/unitresource-4-all 
return unitresources for all units

This code changes the behavior of ListResources such that it returns a UnitResources for every unit in the system.  Thus, the client code can differentiate between a unit that has no resources and one that doesn't exist.

(Review request: http://reviews.vapour.ws/r/3949/)
d0d3c11
@ericsnowcurrently
Move stubStatePersistence to state/testing.StubPersistence.
eb744dd
@ericsnowcurrently
Rename the test suites.
1f8a467
@ericsnowcurrently
Rename some constants.
13535bd
@ericsnowcurrently
Persistence -> ResourcePersistence.
661f190
@ericsnowcurrently
Staged -> StagedResource.
ea54fd2
@ericsnowcurrently
Move resource/persistence/* into state/.
92ed034
@ericsnowcurrently
Fix-ups post-move.
49707ba
@jujubot
Merge pull request #4510 from ericsnowcurrently/resources-persistence… 
…-in-state

Move resource persistence into the state package to help model migration.

The model migration work relies on access to the mongo doc structs and expects them to all be in the state package.  Consequently we must move resource persistence out of the component package.  Later we can look into how to move it back.

(Review request: http://reviews.vapour.ws/r/3946/)
a8e2e69
@natefinch
initial code for supporting --resource on upgrade-charm
dd171d0
@natefinch
make sure we only include metadata for the resources we're actually u… 
…ploading
79685fd
@natefinch
tests
f6d89b3
@natefinch
some field comments
40351d0
@natefinch
fix up a million tests
8f09a8a
@natefinch
fix more tests
4c610e8
@natefinch
Review cmoments
244f573
@jujubot
Merge pull request #4538 from natefinch/charm-upgrade-resources 
support --resource on upgrade-charm

This change reuses the infrastructure written for `juju deploy --resource` to add a --resource flag to upgrade-charm.  

There's a key difference for upgrade-charm, though.  During deploy, we need to upload metadata for all resources, but during upgrade-charm, we already have metadata for all the resources, and we only need to upload metadata for resources that are being changed.

(Review request: http://reviews.vapour.ws/r/3974/)
1e2e9de
@kat-co
Merge master into feature-resources.
4b24e47
@jujubot
Merge pull request #4547 from kat-co/feature-resources-merge-master 
Feature resources merge master



(Review request: http://reviews.vapour.ws/r/3986/)
d1b5e16
@kat-co
Merge master feature-resources.
6a3843f
@jujubot
Merge pull request #4585 from kat-co/feature-resources-merge-master 
Feature resources merge master



(Review request: http://reviews.vapour.ws/r/4025/)
976c7c4
@sinzui
Contributor

sinzui commented Mar 1, 2016

$$merge$$ JFDI
@jujubot
Contributor

jujubot commented Mar 1, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

jujubot added a commit that referenced this pull request Mar 1, 2016

@jujubot
Merge pull request #4569 from juju/feature-resources 
Feature resources

This branch is good to merge. The failures seen on
     http://reports.vapour.ws/releases/3675
are all attributed to master (which is the last merge into this branch)

There are no bugs reported against feature resources, there never was
    https://bugs.launchpad.net/juju-core/feature-resources

(Review request: http://reviews.vapour.ws/r/4007/)
d19009b

@jujubot jujubot merged commit d19009b into master Mar 1, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment