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.

Sign up for GitHub

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

Jump to bottom

Add back the state of each unit in a relation to goal state #9263

Merged
merged 1 commit into from Sep 28, 2018
Merged

Add back the state of each unit in a relation to goal state #9263

merged 1 commit into from Sep 28, 2018

Conversation

wallyworld
Copy link
Member

@wallyworld wallyworld commented Sep 28, 2018 •
edited

Description of change

Goal state output was changed to adhere to spec but in so doing lost some status that people ended up relying on. So we add that back in. The "relations" block now shows relation status plus the status of each unit in the relation. Also, we were showing peer units in the relation section as well as the units section - this has been fixed as well.

QA steps

Deploy mediawiki and mariadb and relate.

$ juju run --unit mariadb/0 goal-state

units:
  mariadb/0:
    status: active
    since: 2018-09-28 00:59:42Z
relations:
  db:
    mediawiki:
      status: joined
      since: 2018-09-28 01:21:25Z
    mediawiki/0:
      status: active
      since: 2018-09-28 01:33:30Z

Bug reference

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

@wallyworld
Copy link
Member Author

goal state output - restore units

babbageclunk
babbageclunk approved these changes Sep 28, 2018
View reviewed changes
Copy link
Contributor

@babbageclunk babbageclunk left a comment

Choose a reason for hiding this comment

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

Looks great - just one question about the peer unit removal.

apiserver/facades/agent/uniter/uniter.go Outdated
if err != nil {
return nil, errors.Annotate(err, "getting relation status")

// Peer units are shown in the Units section, not here.
Copy link
Contributor

Choose a reason for hiding this comment

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

Why doesn't the e.Relation.Role == "peer" check above cover this case? Is it because the relation might be a normal provider/requirer one but to the same application? Maybe worth expanding the comment?

Copy link
Member Author

Choose a reason for hiding this comment

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

The comment was poorly worded. I've updated to make it clearer

@wallyworld
Copy link
Member Author

$$merge$$

@jujubot jujubot merged commit 2db428d into juju:2.4 Sep 28, 2018
@wallyworld wallyworld mentioned this pull request Oct 10, 2018
Merged
jujubot added a commit that referenced this pull request Oct 11, 2018
@jujubot
Merge pull request #9299 from wallyworld/merge-2.4-20181010
f364d72 
#9299

## Description of change

Merge 2.4 into develop, picking up these PRs:
#9287 container networking, manually provisioned machines
#9296 more robust cmr controller connectivity
#9251 Fix the exporting of the series of the application when exporting a bundle
#9293 bundle deploy panic
#9285 tomb.Go shouldn't be called multiple times from a non-tomb managed goroutine
#9263 Add back the state of each unit in a relation to goal state
#9235 handle maas partitions in a storage constraint
#9191 Add a default retry inside 'juju status'
#9177 latest ec2 instance types
#9180 fix space check before upgrade
#9159 mongo collection size

## QA steps

bootstrap smoke test
jameinel added a commit to jameinel/juju that referenced this pull request Oct 25, 2018
@jameinel
Merge into 2.4 into 2.5
74c0afc 
Including:
 * Merge pull request juju#9359 from juju/2.3
 * Merge pull request juju#9355 from howbazaar/2.4-engine-backoff
 * Merge pull request juju#9345 from anastasiamac/only-clear-current-when-asked-lp1796148
 * Merge pull request juju#9335 from babbageclunk/mux-worker
 * Merge pull request juju#9333 from wallyworld/merge-2.3-20181018
 * Merge pull request juju#9323 from ExternalReality/fix_logging_path
 * Merge pull request juju#9327 from mitechie/enable-export-bundle
 * Merge pull request juju#9315 from manadart/2.4-acceptance-maas-network-bind
 * Merge pull request juju#9300 from manadart/2.4-provisioner-testing-with-mocks
 * Merge pull request juju#9287 from manadart/2.4
 * Merge pull request juju#9297 from anastasiamac/24-better-debug-lp1779677
 * Merge pull request juju#9298 from wallyworld/cmr-controller-connect-robust-2.4
 * Merge pull request juju#9251 from howbazaar/bundle-export-series
 * Merge pull request juju#9293 from babbageclunk/bundle-deploy-panic-2.4
 * Merge pull request juju#9285 from howbazaar/2.4-fix-multiwatcher
 * Merge pull request juju#9264 from mitechie/forward-9235
 * Merge pull request juju#9263 from wallyworld/goal-state-units
 * Merge pull request juju#9255 from howbazaar/2.4-bionic-tests
 * Merge pull request juju#9203 from wallyworld/go-1.11-2.4
 * Merge pull request juju#9191 from howbazaar/2.4-status-retry
 * Merge pull request juju#9178 from hmlanigan/fixes
 * Merge pull request juju#9177 from SimonRichardson/ec2-instance-types-2.4
 * Merge pull request juju#9181 from babbageclunk/2.3-merge-into-2.4
 * Merge pull request juju#9169 from juju/2.3
 * Merge pull request juju#9167 from babbageclunk/caasfirewaller-test-fix-2.4
 * Merge pull request juju#9166 from babbageclunk/s390x-test-fix-2.4
 * Merge pull request juju#9152 from jameinel/2.3-into-2.4
 * Merge pull request juju#9080 from vinu2003/juju_exportBundle_timeDelayFix
 * Merge pull request juju#9138 from wallyworld/charm.v6-dep-update
 * Merge pull request juju#9137 from anastasiamac/test-order-fix-24
 * Merge pull request juju#9134 from anastasiamac/merge-23-into-24-20180829
 * Merge pull request juju#9132 from wallyworld/improve-charm-versionstring
 * Merge pull request juju#9126 from anastasiamac/empty-default-settings-lp1789415-24
 * Merge pull request juju#9117 from anastasiamac/init-cmd-lp1785205-24
 * Merge pull request juju#9104 from wallyworld/merge-2.3-20180823

Bugs

 * https://bugs.launchpad.net/juju/+bug/1798485
 * https://bugs.launchpad.net/juju/+bug/1793245
 * https://bugs.launchpad.net/juju/+bug/1796148
 * https://bugs.launchpad.net/juju/+bug/1798001
 * https://bugs.launchpad.net/juju/+bug/1793284
 * https://bugs.launchpad.net/juju/+bug/1796106
 * https://bugs.launchpad.net/juju/+bug/1779677
 * https://bugs.launchpad.net/juju/+bug/1795499
 * https://bugs.launchpad.net/juju/+bug/1773357
 * https://bugs.launchpad.net/juju/+bug/1792299
 * https://bugs.launchpad.net/juju/+bug/1782803
 * https://bugs.launchpad.net/juju/+bug/1782367
 * https://bugs.launchpad.net/juju/+bug/1790626
 * https://bugs.launchpad.net/juju/+bug/1789211
 * https://bugs.launchpad.net/juju/+bug/1789447
 * https://bugs.launchpad.net/juju/+bug/1789415
 * https://bugs.launchpad.net/juju/+bug/1785205
 * https://bugs.launchpad.net/juju/2.3/+bug/1788554
@jameinel jameinel mentioned this pull request Oct 25, 2018
Merged
jujubot added a commit that referenced this pull request Oct 26, 2018
@jujubot
Merge pull request #9372 from jameinel/2.4-into-2.5
a891683 
#9372

## Description of change

Merge of the current tip of 2.4 into 2.5 bringing in patches:
 prdesc Merge pull request #9359 from juju/2.3
 prdesc Merge pull request #9355 from howbazaar/2.4-engine-backoff
 prdesc Merge pull request #9345 from anastasiamac/only-clear-current-when-asked-lp1796148
 prdesc Merge pull request #9335 from babbageclunk/mux-worker
 prdesc Merge pull request #9333 from wallyworld/merge-2.3-20181018
 prdesc Merge pull request #9323 from ExternalReality/fix_logging_path
 prdesc Merge pull request #9327 from mitechie/enable-export-bundle
 prdesc Merge pull request #9315 from manadart/2.4-acceptance-maas-network-bind
 prdesc Merge pull request #9300 from manadart/2.4-provisioner-testing-with-mocks
 prdesc Merge pull request #9287 from manadart/2.4
 prdesc Merge pull request #9297 from anastasiamac/24-better-debug-lp1779677
 prdesc Merge pull request #9298 from wallyworld/cmr-controller-connect-robust-2.4
 prdesc Merge pull request #9251 from howbazaar/bundle-export-series
 prdesc Merge pull request #9293 from babbageclunk/bundle-deploy-panic-2.4
 prdesc Merge pull request #9285 from howbazaar/2.4-fix-multiwatcher
 prdesc Merge pull request #9264 from mitechie/forward-9235
 prdesc Merge pull request #9263 from wallyworld/goal-state-units
 prdesc Merge pull request #9255 from howbazaar/2.4-bionic-tests
 prdesc Merge pull request #9203 from wallyworld/go-1.11-2.4
 prdesc Merge pull request #9191 from howbazaar/2.4-status-retry
 prdesc Merge pull request #9178 from hmlanigan/fixes
 prdesc Merge pull request #9177 from SimonRichardson/ec2-instance-types-2.4
 prdesc Merge pull request #9181 from babbageclunk/2.3-merge-into-2.4
 prdesc Merge pull request #9169 from juju/2.3
 prdesc Merge pull request #9167 from babbageclunk/caasfirewaller-test-fix-2.4
 prdesc Merge pull request #9166 from babbageclunk/s390x-test-fix-2.4
 prdesc Merge pull request #9152 from jameinel/2.3-into-2.4
 prdesc Merge pull request #9080 from vinu2003/juju_exportBundle_timeDelayFix
 prdesc Merge pull request #9138 from wallyworld/charm.v6-dep-update
 prdesc Merge pull request #9137 from anastasiamac/test-order-fix-24
 prdesc Merge pull request #9134 from anastasiamac/merge-23-into-24-20180829
 prdesc Merge pull request #9132 from wallyworld/improve-charm-versionstring
 prdesc Merge pull request #9126 from anastasiamac/empty-default-settings-lp1789415-24
 prdesc Merge pull request #9117 from anastasiamac/init-cmd-lp1785205-24
 prdesc Merge pull request #9104 from wallyworld/merge-2.3-20180823

## QA steps

See individual patches.

## Documentation changes

See individual patches.

## Bug reference

 prdesc https://bugs.launchpad.net/juju/+bug/1798485
 prdesc https://bugs.launchpad.net/juju/+bug/1793245
 prdesc https://bugs.launchpad.net/juju/+bug/1796148
 prdesc https://bugs.launchpad.net/juju/+bug/1798001
 prdesc https://bugs.launchpad.net/juju/+bug/1793284
 prdesc https://bugs.launchpad.net/juju/+bug/1796106
 prdesc https://bugs.launchpad.net/juju/+bug/1779677
 prdesc https://bugs.launchpad.net/juju/+bug/1795499
 prdesc https://bugs.launchpad.net/juju/+bug/1773357
 prdesc https://bugs.launchpad.net/juju/+bug/1792299
 prdesc https://bugs.launchpad.net/juju/+bug/1782803
 prdesc https://bugs.launchpad.net/juju/+bug/1782367
 prdesc https://bugs.launchpad.net/juju/+bug/1790626
 prdesc https://bugs.launchpad.net/juju/+bug/1789211
 prdesc https://bugs.launchpad.net/juju/+bug/1789447
 prdesc https://bugs.launchpad.net/juju/+bug/1789415
 prdesc https://bugs.launchpad.net/juju/+bug/1785205
 prdesc https://bugs.launchpad.net/juju/2.3/+bug/1788554
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@babbageclunk babbageclunk babbageclunk approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@wallyworld @babbageclunk @jujubot