Change location of the meter status worker state file. #6843

Merged
merged 1 commit into from Apr 4, 2017

Conversation

Projects
None yet
4 participants
Member

tasdomas commented Jan 20, 2017

The meter status worker keeps a local file to cache the currently known value of meter status in case connection to the controller is lost. This PR changes the location of that state file, moving it to the agent directory.

Does this need any upgrade steps? Perhaps moving the old file?

Member

tasdomas commented Jan 23, 2017

@howbazaar - we don't really need to move the old file - an upgrade happening implies that the agent has connectivity, so it will receive an update soon enough. I could add an upgrade step that removes the old file, though.

Owner

cmars commented Jan 23, 2017

!!build!!

Owner

cmars commented Jan 23, 2017

QA steps:

Deploy a charm with this version of Juju. ssh into unit. Confirm that meter-status.yaml file is in /var/lib/juju/agents/{unit name}/meter-status.yaml instead of /var/lib/juju/agents/meter-status.yaml.

Deploy a metered charm with Juju release prior to this fix. upgrade-juju to a release containing this fix. Confirm same results as above.

Member

tasdomas commented Feb 7, 2017

@howbazaar - PTAL

Owner

cmars commented Feb 17, 2017

Pinging @howbazaar for another look...

The upgrade steps need to be for the correct version.

upgrades/steps_20.go
@@ -36,6 +36,16 @@ func stepsFor20() []Step {
targets: []Target{Controller},
run: removeCharmGetCache,
},
+ &upgradeStep{
@howbazaar

howbazaar Feb 20, 2017

Owner

These upgrade steps are in the wrong place. There should be some for 2.2. These are for 2.0.

Member

tasdomas commented Feb 21, 2017

@howbazaar - updated, thanks for the review!

Member

tasdomas commented Mar 21, 2017

@howbazaar - could you take a look at this?

Member

tasdomas commented Apr 4, 2017

$$merge$$

Contributor

jujubot commented Apr 4, 2017

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

Contributor

jujubot commented Apr 4, 2017

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/10616

Member

tasdomas commented Apr 4, 2017

!!build!!

Member

tasdomas commented Apr 4, 2017

$$merge$$

Contributor

jujubot commented Apr 4, 2017

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

@jujubot jujubot merged commit 1c992a8 into juju:develop Apr 4, 2017

1 check passed

github-check-merge-juju Built PR, ran unit tests, and tested LXD deploy. Use !!.*!! to request another build. IE, !!build!!, !!retry!!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment