/juju

Merge latest master #4822

Merged
merged 268 commits into from Mar 21, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
@voidspace

voidspace commented Mar 21, 2016

Merge latest master.

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

mjs and others added some commits Feb 22, 2016

@mjs
cmd/jujud/agent/machine: Introduce stateworkers manifold 
"stateworkers" is a temporary manifold that runs workers which have
not yet been converted to run directly under the dependency engine. It
obtains a *state.State from the "state" manifold and passes it to a
function which starts the workers.

As part of this change the old "state-starter" and "state" workers
have been removed from the machine agent. They have been replaced by
equivalent dependency engine manifolds.
d8cd97e
@mjs
worker/state: Change StateTracker to be an interface 
This will simplify testing elsewhere.
027b76c
@jujubot
Merge pull request #4528 from mjs/MADE-state-workers 
cmd/jujud/agent/machine: Introduce stateworkers manifold

"stateworkers" is a temporary manifold that runs workers which have not yet been converted to run directly under the dependency engine. It obtains a *state.State from the "state" manifold and passes it to a function which starts the workers.

As part of this change the old "state-starter" and "state" workers have been removed from the machine agent. They have been replaced by equivalent dependency engine manifolds.


(Review request: http://reviews.vapour.ws/r/3964/)
8003f62
@mjs
Resync MADE-state-workers to latest blessed master 
Merge commit 'e13ffd1c3d751be653dac2a8ed0adc233f8c75d6'

Conflicts:
	cmd/jujud/agent/machine/manifolds_test.go
d902479
@jujubot
Merge pull request #4540 from mjs/MADE-state-workers-resync 
Made state workers resync



(Review request: http://reviews.vapour.ws/r/3976/)
96898bf
@natefinch
now we pass up the filename and verify the extension
69714bf
@natefinch
missed component/all section
dcfc47e
@mjs
Resync MADE-state-workers to master 
This merges master up to 2564190.

Conflicts:
	cmd/jujud/agent/machine/manifolds.go
	cmd/jujud/agent/machine/manifolds_test.go
228ffc5
@jujubot
Merge pull request #4644 from mjs/MADE-state-workers-resync 
Resync MADE-state-workers to master

This merges master up to 2564190.

(Review request: http://reviews.vapour.ws/r/4087/)
0d8648d
@mjs
cmd/jujud/agent/machine: Fix race in StateWorkersSuites
d5c8e4d
@jujubot
Merge pull request #4658 from mjs/StateWorkersSuite-race 
cmd/jujud/agent/machine: Fix race in StateWorkersSuite



(Review request: http://reviews.vapour.ws/r/4098/)
95b8983
@natefinch
missing files replaced
345d217
@natefinch
code review changes
6bf8dec
@natefinch
code review changes
6e9ddc9
@natefinch
rename files to be slightly nicer
7018e02
@natefinch
extra the filename logic into a couple helpers
56c712b
@natefinch
rekajigger so the mime stuff is in an internal package
3cbc50a
@natefinch
remove use of sync.pool
4575717
@kat-co
Corrected tests to conform to new type signatures.
49d87a3
@jujubot
Merge pull request #4683 from kat-co/check-extension 
Check extension



(Review request: http://reviews.vapour.ws/r/4122/)
302dd0b
@howbazaar
Merge branch 'master' into update-MADE-state-workers
e8bf908
@jujubot
Merge pull request #4690 from howbazaar/update-MADE-state-workers 
Update made state workers

Merge in tip of master.

(Review request: http://reviews.vapour.ws/r/4129/)
db7f12f
@natefinch
fix build constraint
5b4b7c0
@jujubot
Merge pull request #4696 from natefinch/fix-1556146 
Fix bug 1556146

missing a period in the build constraint, fixes https://bugs.launchpad.net/juju-core/+bug/1556146

(Review request: http://reviews.vapour.ws/r/4135/)
58c0c09
@ericsnowcurrently
Add a "latest charm" handler registry.
be2de25
@ericsnowcurrently
Add basic charmstore.Client implementations.
35c7a5f
@ericsnowcurrently
Consolidate the different charm store clients.
17008a9
@ericsnowcurrently
Add charmstore.Client.AsRepo().
52c1c21
@ericsnowcurrently
Factor out charmstore.LatestCharmInfo().
1c0bae0
@ericsnowcurrently
Drop Client.Latest() and modelClient.
a51710a
@ericsnowcurrently
Drop some extraneous lines.
ff5f628
@ericsnowcurrently
Fix some typos.
4171f38
@ericsnowcurrently
NewClient() -> WrapBaseClient().
424ecd1
@ericsnowcurrently
Use charmstore.LatestCharmInfo() on the API server.
f2c2077
@ericsnowcurrently
Also retrieve the latest resources info.
b501444
@ericsnowcurrently
Add CharmInfo.Timestamp.
0dbee1a
@ericsnowcurrently
Register a LatestCharmHandler for resources.
7bd1746
@ericsnowcurrently
Add a TODO.
e3039e0
@ericsnowcurrently
Fix a test.
e501735
@ericsnowcurrently
CharmInfo.URL -> CharmInfo.LatestRevision.
7daf70b
@ericsnowcurrently
Drop the model worker registry.
1302c8e
@ericsnowcurrently
Drop the dedicated client.Close() implementation.
8766498
@ericsnowcurrently
Clean up doc comments.
41db01d
@ericsnowcurrently
Add tests.
b399925
@ericsnowcurrently
Drop the test for NewClient().
a233518
@ericsnowcurrently
listHandlers -> createHandlers.
a49c2b6
@ericsnowcurrently
Clean up an interface.
2b17f71
@ericsnowcurrently
Move latest-specific code down into retrieveLatestCharmInfo().
f0019e1
@ericsnowcurrently
uuid -> modelUUID.
1feb56c
@ericsnowcurrently
Split NewDefaultClient() out from NewClient().
9c08dde
@ericsnowcurrently
Do not handle nil closers in WrapBaseClient().
a55d3b1
@ericsnowcurrently
Use valid dummy values.
eeb40e5
@ericsnowcurrently
Clean up some error handling.
7acb9d2
@ericsnowcurrently
URL -> OriginalURL.
df0578e
@ericsnowcurrently
Add charmstore.JujuMetadata.
a48df4a
@ericsnowcurrently
Drop Client.AsRepo() (and add Client.WithMetadata()).
a80b0a4
@ericsnowcurrently
Drop the charmstore.Client interface and export the Client struct.
62ac044
@ericsnowcurrently
Move LatestCharmInfo() to its own file.
283ed04
@ericsnowcurrently
Fix dependencies.
524e9d6
@ericsnowcurrently
Drop an unused import.
ef06a61

jameinel and others added some commits Mar 17, 2016

@jameinel
Use the stringForwarder in lxdclient.EnsureImageExists. 
That way all code paths get the property that the progress messages will be
handled as quickly as they can without slowing anything else down.
As we know they are just 'progress' we can omit them without loss.
71afa42
@jameinel
fix import order
d6a0f51
@natefinch
rename push-resource to attach
f160df4
@jujubot
Merge pull request #4773 from natefinch/attach 
rename push-resource to attach
278c0d0
@perrito666
Upgraded goose in dependencies.
e6b1ebc
@perrito666
Address @natefinch comments.
0fee543
@wallyworld
Add proper support for FileAttr values
92e03a2
@jameinel
find some race conditions. 
Only 1 was in the actual code, all the rest was the testing code.
Still important to be -race safe.
bb8b939
@jameinel
Add a test which shows a race on setting and then reading discardCount. 
Change to using 'atomic' operations for discardCount. This may be a bit overboard,
as the actual count there is never perfectly accurate, but I like having primatives
that are race-safe even when you abuse them.
054a514
lp1558158 Rebootstrap if no controllers found 
If ControllerInfo returns a list length of 0, then
attempt the rebootstrap as the provider doesn't know
about any controllers for this controller.
e8fc102
@jujubot
Merge pull request #4776 from perrito666/support_keystone_3 
Support keystone 3



(Review request: http://reviews.vapour.ws/r/4217/)
d27ccf3
@wallyworld
Fix small issues
065f640
Addres review comments.
e803a2f
Address review comments.
20e8ac9
Address review comments.
600c756
@jujubot
Merge pull request #4783 from cherylj/fix-restore 
lp1558158 Rebootstrap if no controllers found

If ControllerInfo returns a list length of 0, then
attempt the rebootstrap as the provider doesn't know
about any controllers for this controller.

(Review request: http://reviews.vapour.ws/r/4224/)
172f057
@jujubot
Merge pull request #4787 from cherylj/merge-MADE-state-workers 
MADE-state-workers

In its last CI run, this branch only exhibited the same known restore failures as master:
http://reports.vapour.ws/releases/3761

Restore failure inherited from master: https://bugs.launchpad.net/juju-core/+bug/1558158

There are no bugs against this branch.

(Review request: http://reviews.vapour.ws/r/4228/)
d253078
@ericsnowcurrently
Add resource.UnitResources.DownloadProgress.
a20aa3a
@ericsnowcurrently
Add api.UnitResources.DownloadProgress.
f990cf1
@ericsnowcurrently
Add resourceDoc.DownloadProgress.
d1505dd
@ericsnowcurrently
Make a persistence test more correct.
c4e1f16
@ericsnowcurrently
Include no-resource units in resourceState.ListResources() results.
f1d9627
@ericsnowcurrently
Don't sort out units in the API.
0874abb
@ericsnowcurrently
Add unitSetter.pending.
41b5ff9
@ericsnowcurrently
Do not list pending unit resources.
c52a43a
@ericsnowcurrently
Add ResourcePersistence.SetUnitResourceProgress().
f618558
@ericsnowcurrently
Drop a reference to resourceadapters.DataStore.
04e6d0c
@ericsnowcurrently
Track download progress via unitSetter.Read().
605a48f
@ericsnowcurrently
Add FormattedDetailResource.Progress.
6bd6025
@ericsnowcurrently
Add FormattedDetailResource.progress.
b42875a
@ericsnowcurrently
Update the tabular output to show download progress.
2a8c1fb
@ericsnowcurrently
Use a clearer syntax for checking a map of bools.
d75767b
@ericsnowcurrently
Drop an unused import.
38e1a0c
@jujubot
Merge pull request #4778 from ericsnowcurrently/resources-uniter-down… 
…load-progress

Show unit download progress for resources.



(Review request: http://reviews.vapour.ws/r/4219/)
ab0877d
@kat-co
Merge master into feature-resources-merge-master.
19c5594
@perrito666
Fixed documentation issues in status-history
6aa5bb1
@ericsnowcurrently
Add the --channel flag to "juju charm list-resources".
d363ced
@jujubot
Merge pull request #4792 from ericsnowcurrently/resources-charm-list-… 
…resources-channel-flag

Add the --channel flag to "juju charm list-resources".



(Review request: http://reviews.vapour.ws/r/4234/)
b5bc02a
@kat-co
Merge upstream/feature-resources. 
Conflicts:
    dependencies.tsv
21ec584
@jujubot
Merge pull request #4794 from kat-co/feature-resources-merge-master 
Merge master into feature-resources.



(Review request: http://reviews.vapour.ws/r/4236/)
0676ac3
@wallyworld
Merge branch 'master' into interactive-add-credentials
881fb08
@wallyworld
Fix merge issue
5145b24
@jujubot
Merge pull request #4763 from wallyworld/interactive-add-credentials 
Interactive add credentials

The add-credentials command now supports an ineractive mode (if no file is specified).
We want to be able to control the order of attribute entry, so the environ provider CredentialSchema has been changed to a slice rather than a map.
We also add a FilePath bool to the CredentialAttr so that a value can be validated as being a valid filename.

Example:

$ juju add-credential homestack
  credential name: me
  select auth-type [userpass*, access-key]: 
  username: user
  password: 
  tenant-name: tenant
credentials added for cloud homestack
$

(Review request: http://reviews.vapour.ws/r/4202/)
af008a5
@wallyworld
Restore some old deploy code for now to fix the gui
a56ca08
@jujubot
Merge pull request #4797 from wallyworld/restore-old-deploy-for-now 
Restore some old deploy code for now to fix the gui

Removing some deprecated code broke the gui.
Adding back until the gui is updated.

(Review request: http://reviews.vapour.ws/r/4239/)
6b57321
@jujubot
Merge pull request #4791 from perrito666/fix_1557714_status_history_b… 
…roken

Fixed documentation issues in status-history

Fixes https://bugs.launchpad.net/juju-core/+bug/1557714

(Review request: http://reviews.vapour.ws/r/4233/)
02195ed
@wallyworld
Fix test on Windows
8af9181
@wallyworld
Tweak
f9cb41d
@wallyworld
Better solution
051bf8a
@jujubot
Merge pull request #4809 from wallyworld/fix-invalid-filepath-windows 
Fix invalid filepath windows

Fixes: https://bugs.launchpad.net/juju-core/+bug/1559706
Ensure a test using an absolute filepath works on windows.

(Review request: http://reviews.vapour.ws/r/4251/)
657dd05
@jujubot
Merge pull request #4805 from cherylj/merge-feature-resources 
Merge feature resources

The feature-resources branch is ready for merging.  This branch had a bless on its last CI run:  http://reports.vapour.ws/releases/3782

There are no bugs open against this branch:  https://bugs.launchpad.net/juju-core/feature-resources

(Review request: http://reviews.vapour.ws/r/4247/)
fa84738
@anastasiamac
Fix ordering issue for unsupported constraints tests.
b97303d
@jujubot
Merge pull request #4811 from anastasiamac/order-bug1558191-part2 
Fix ordering issue for unsupported constraints tests.

Trivial:
1. EC2 test: use SameContents check instead of DeepEquals;
2. LXD test: remove redundant sort as we are using SameContents for consistency with similar tests in other providers.

(Review request: http://reviews.vapour.ws/r/4253/)
f47ccff
@jujubot
Merge pull request #4772 from jameinel/lxd-container-status-1558061 
Get the right container status even when downloading the image

fixes-1558061

It turns out that our calls to Machine.SetInstanceStatus are *very* slow. My timing information indicates that we can only process them about 1/second. As such, what was happening was the LXD image was copying from cloud-images in only 5s, and we would then start launching the instance. But while all that polling was going on, our goroutine was reading from the LXD socket and seeing "1%"..."2%". LXD was emitting those messages very quickly, but we were being very slow to handle them.

This adds a helper object "utils/stringforwarder" that will take a callback function, and call it as fast as it will allow, but drop the other messages on the floor. And then when we're done with CopyImage() we call Stop() which ensures we won't get any more messages (all are guaranteed to be dropped after that point).

I went ahead and always added the drop logic to EnsureImageExists, because we know those messages are all ephemeral, so whatever is handling them will happily drop one here and there.

There is also 1 small code cleanup, where I added a type for StatusCallback because the existing interface definition required repeating a lot of ugly func() definition in multiple places.

Very strange to think that we can handle 150MB downloaded over the internet faster than we can send 100 SetInstanceStatus() calls. I have the feeling SetInstanceStatus is intentionally rate limited to 1/s.

(Review request: http://reviews.vapour.ws/r/4213/)
c00b1f3
Merge remote-tracking branch 'upstream/master' into drop-maas-1.8-mas… 
…ter-merge
d8c5be6
@voidspace

voidspace commented Mar 21, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Mar 21, 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 21, 2016

@jujubot
Merge pull request #4822 from voidspace/drop-maas-1.8-master-merge 
Merge latest master

Merge latest master.

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

@jujubot jujubot merged commit b1004dd into juju:drop-maas-1.8-support-from-juju2 Mar 21, 2016

@voidspace voidspace deleted the voidspace:drop-maas-1.8-master-merge branch Oct 6, 2016

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