Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

If SetSupportedContainers doesn't change the value, don't write to the db #9672

Merged
merged 2 commits into from Jan 25, 2019

Conversation

SimonRichardson
Copy link
Member

Description of change

On startup, machine agents call SetSupportedContainers. If that
doesn't actually change the supported containers, no need to write
to the database.

This supersedes #9660 as it contains
the full PR required - includes the landed juju/txn#49
changes as well.

QA steps

You can use:

$ juju bootstrap lxd lxd
$ juju add-machine
$ juju model-config -m controller logging-config='<root>=INFO;juju.state.txn=TRACE'
# restart machine-0 in either the model or the controller, see what txns are run

Documentation changes

None.

Bug reference

https://bugs.launchpad.net/juju/+bug/1812981

…e db

On startup, machine agents call SetSupportedContainers. If that
doesn't actually change the supported containers, no need to write
to the database.

This supersedes juju#9660 as it contains
the full PR required - includes the landed juju/txn#49
changes as well.
Copy link
Member

@hmlanigan hmlanigan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, qa was happy. Just the 1 question.

state/machine.go Outdated Show resolved Hide resolved
The following code just tests if the container types are in a
different order, then we don't care and continue onwards as if they
where in the same order.

Tests where added to ensure that we test that path.
Copy link
Member

@hmlanigan hmlanigan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@hmlanigan
Copy link
Member

$$merge$$

@jujubot jujubot merged commit dd21031 into juju:2.5 Jan 25, 2019
jujubot added a commit that referenced this pull request Feb 2, 2019
#9704

## Description of change

Merge the 2.5 branch, including the following pull requests:

#9702 Remove juju- prefix from k8s pod names
#9698 Make raft logging more usefull
#9616 hubwatcher cache removal
#9691 raft metrics registration fix
#9695 log try again errors as info
#9678 API server metrics collector
#9693 support more k8s specific pod attributes
#9685 filtered access to leases in store
#9692 fix k8s charm upgrades
#9676 fix meter status watcher
#9683 handle failures writing lease changes to database
#9688 update juju txn dependency
#9684 exit http worker after a timeout even if muxes are in use
#9675 add raft transport dependencies
#9672 optimise SetSupportedContainer db writes
#9669 fix goroutine leak in log sink handler
#9666 fix generation of operator tag for k8s docker images
#9656 handle k8s app config in deploy ConfigYAML
#9631 multi-cloud controllers
#9638 add support for setting k8s service annotations

## QA steps

bootstrap and deploy
@SimonRichardson SimonRichardson deleted the set-supported-containers-1812981 branch February 19, 2019 11:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants